check for NULL

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index e60b07f5b998dd24f06410017fd1f6dbf1bebbe1..a5e4a48c395336e44b62d9082b5b99ba890d70a7 100644 (file)
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -833,10 +833,20 @@ do_upload (void *cls,
          fn = GNUNET_CONTAINER_meta_data_get_by_type (p->meta,
                                                       EXTRACTOR_METATYPE_FILENAME);
          p = p->dir;
-         GNUNET_asprintf (&p->emsg, 
-                          _("Recursive upload failed at `%s'"),
-                          fn);
-         GNUNET_free (fn);
+         if (fn != NULL)
+           {
+             GNUNET_asprintf (&p->emsg, 
+                              _("Recursive upload failed at `%s': %s"),
+                              fn,
+                              p->emsg);
+             GNUNET_free (fn);
+           }
+         else
+           {
+             GNUNET_asprintf (&p->emsg, 
+                              _("Recursive upload failed: %s"),
+                              p->emsg);              
+           }
          GNUNET_FS_file_information_sync (p);
          pi.status = GNUNET_FS_STATUS_PUBLISH_ERROR;
          make_publish_status (&pi, sc, p, 0);