From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 25 Mar 2010 10:40:55 +0000 (+0000)
Subject: check for NULL
X-Git-Tag: initial-import-from-subversion-38251~22379
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=214fa252fc8f4fd5bed8ad920f61d560bedb3821;p=oweals%2Fgnunet.git

check for NULL
---

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index e60b07f5b..a5e4a48c3 100644
--- 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);