nitpicks

2 files changed, 5 insertions, 2 deletions

diff --git a/src/fs_event_handler.c b/src/fs_event_handler.c
index c00cc7bc..94538824 100644
--- a/src/fs_event_handler.c
+++ b/src/fs_event_handler.c
@@ -1610,6 +1610,8 @@ GNUNET_GTK_fs_event_handler (void *cls,
                            info->value.publish.filename,
                            info->value.publish.size,
                            info->value.publish.pctx);
+      if (ret == NULL)
+        return ret;
       if (info->value.publish.specifics.resume.message != NULL)
         {
           ret = handle_publish_error (ret,
diff --git a/src/main_window_file_publish.c b/src/main_window_file_publish.c
index 80c600d4..c6580ea1 100644
--- a/src/main_window_file_publish.c
+++ b/src/main_window_file_publish.c
@@ -214,6 +214,7 @@ add_file_at_iter (const char *filename,
   GtkTreeStore *ts;
   GtkTreeIter pos;
   char *file_size_fancy;
+  char *ss;
 
   if (GNUNET_OK != 
       GNUNET_DISK_file_size (filename,
@@ -234,8 +235,8 @@ add_file_at_iter (const char *filename,
                                      EXTRACTOR_METATYPE_FILENAME,
                                      NULL, 0);
   short_fn = filename;
-  while (NULL != strstr (short_fn, DIR_SEPARATOR_STR))
-    short_fn = 1 + strstr (short_fn, DIR_SEPARATOR_STR);
+  while (NULL != (ss = strstr (short_fn, DIR_SEPARATOR_STR)))
+    short_fn = 1 + ss;
   GNUNET_CONTAINER_meta_data_insert (meta,
                                      "<gnunet-gtk>",
                                      EXTRACTOR_METATYPE_FILENAME,