[GNUnet-SVN] r19838 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2012-02-18 16:17:22 +0100 (Sat, 18 Feb 2012)
New Revision: 19838

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
Log:
-fix double free of namespace

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2012-02-18 15:16:33 UTC (rev 19837)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2012-02-18 15:17:22 UTC (rev 19838)
@@ -165,8 +165,8 @@
   fs = GNUNET_FS_start (GNUNET_GTK_main_loop_get_configuration (ml), 
                        "gnunet-fs-gtk",
                        &GNUNET_GTK_fs_event_handler, NULL, 
-                       GNUNET_FS_FLAGS_NONE     /* | 
GNUNET_FS_FLAGS_PERSISTENCE |
-                                                 * GNUNET_FS_FLAGS_DO_PROBES 
*/ ,
+                       GNUNET_FS_FLAGS_NONE | GNUNET_FS_FLAGS_PERSISTENCE 
+                                                /* | GNUNET_FS_FLAGS_DO_PROBES 
*/ ,
                         GNUNET_FS_OPTIONS_END);
   if (NULL == fs)
   {

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c    2012-02-18 15:16:33 UTC 
(rev 19837)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c    2012-02-18 15:17:22 UTC 
(rev 19838)
@@ -1914,7 +1914,8 @@
   /* FIXME-BUG-MAYBE: what if this put fails?  Not convinced it cannot... */
   desc = GNUNET_FS_GTK_get_description_from_metadata (last_meta);
   gtk_tree_store_insert_with_values (uc->ts, &iter, uc->parent, G_MAXINT, 0,
-                                     uc->namespace_name, 1, uc->ns, 2, last_id,
+                                     uc->namespace_name, 1,
+                                    GNUNET_FS_namespace_dup (uc->ns), 2, 
last_id,
                                      3, GNUNET_FS_uri_dup (last_uri), 4,
                                      GNUNET_CONTAINER_meta_data_duplicate
                                      (last_meta), 5, "", 6, desc, 7,
@@ -1936,7 +1937,8 @@
   {
     /* add leaf */
     gtk_tree_store_insert_with_values (uc->ts, &titer, &iter, G_MAXINT, 0,
-                                       uc->namespace_name, 1, uc->ns, 2,
+                                       uc->namespace_name, 1,
+                                      GNUNET_FS_namespace_dup (uc->ns), 2,
                                        next_id, 3, NULL, 4, NULL, 5, "", 6, "",
                                        7, TRUE /* update editable (always) */ ,
                                        8, FALSE