aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-02-18 15:17:22 +0000
committerChristian Grothoff <christian@grothoff.org>2012-02-18 15:17:22 +0000
commita07af809824f33fe5de3033618d2b70822947586 (patch)
treee6741b8948d73c65c627298eee355c5a4f802a2d
parentf6b7583d1ad7b2eb8e9103216c5f9209d3ba9c74 (diff)
downloadgnunet-gtk-a07af809824f33fe5de3033618d2b70822947586.tar.gz
gnunet-gtk-a07af809824f33fe5de3033618d2b70822947586.zip
-fix double free of namespace
-rw-r--r--src/fs/gnunet-fs-gtk.c4
-rw-r--r--src/fs/gnunet-fs-gtk_publish-dialog.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 59238ff6..c031a19f 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -165,8 +165,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
165 fs = GNUNET_FS_start (GNUNET_GTK_main_loop_get_configuration (ml), 165 fs = GNUNET_FS_start (GNUNET_GTK_main_loop_get_configuration (ml),
166 "gnunet-fs-gtk", 166 "gnunet-fs-gtk",
167 &GNUNET_GTK_fs_event_handler, NULL, 167 &GNUNET_GTK_fs_event_handler, NULL,
168 GNUNET_FS_FLAGS_NONE /* | GNUNET_FS_FLAGS_PERSISTENCE | 168 GNUNET_FS_FLAGS_NONE | GNUNET_FS_FLAGS_PERSISTENCE
169 * GNUNET_FS_FLAGS_DO_PROBES */ , 169 /* | GNUNET_FS_FLAGS_DO_PROBES */ ,
170 GNUNET_FS_OPTIONS_END); 170 GNUNET_FS_OPTIONS_END);
171 if (NULL == fs) 171 if (NULL == fs)
172 { 172 {
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 0c609fdf..dd34cf88 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1914,7 +1914,8 @@ add_updateable_to_ts (void *cls, const char *last_id,
1914 /* FIXME-BUG-MAYBE: what if this put fails? Not convinced it cannot... */ 1914 /* FIXME-BUG-MAYBE: what if this put fails? Not convinced it cannot... */
1915 desc = GNUNET_FS_GTK_get_description_from_metadata (last_meta); 1915 desc = GNUNET_FS_GTK_get_description_from_metadata (last_meta);
1916 gtk_tree_store_insert_with_values (uc->ts, &iter, uc->parent, G_MAXINT, 0, 1916 gtk_tree_store_insert_with_values (uc->ts, &iter, uc->parent, G_MAXINT, 0,
1917 uc->namespace_name, 1, uc->ns, 2, last_id, 1917 uc->namespace_name, 1,
1918 GNUNET_FS_namespace_dup (uc->ns), 2, last_id,
1918 3, GNUNET_FS_uri_dup (last_uri), 4, 1919 3, GNUNET_FS_uri_dup (last_uri), 4,
1919 GNUNET_CONTAINER_meta_data_duplicate 1920 GNUNET_CONTAINER_meta_data_duplicate
1920 (last_meta), 5, "", 6, desc, 7, 1921 (last_meta), 5, "", 6, desc, 7,
@@ -1936,7 +1937,8 @@ add_updateable_to_ts (void *cls, const char *last_id,
1936 { 1937 {
1937 /* add leaf */ 1938 /* add leaf */
1938 gtk_tree_store_insert_with_values (uc->ts, &titer, &iter, G_MAXINT, 0, 1939 gtk_tree_store_insert_with_values (uc->ts, &titer, &iter, G_MAXINT, 0,
1939 uc->namespace_name, 1, uc->ns, 2, 1940 uc->namespace_name, 1,
1941 GNUNET_FS_namespace_dup (uc->ns), 2,
1940 next_id, 3, NULL, 4, NULL, 5, "", 6, "", 1942 next_id, 3, NULL, 4, NULL, 5, "", 6, "",
1941 7, TRUE /* update editable (always) */ , 1943 7, TRUE /* update editable (always) */ ,
1942 8, FALSE 1944 8, FALSE