AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix duplicated id detection in gtkbuilder

Browse Source 
Fix memory handling of duplicated id hashtable and add unit test
This commit is contained in:
Paolo Borelli 2009-08-14 00:08:09 +02:00
parent bd0755753a
commit 6cfb23d185
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkbuilderparser.c
View File

@ -404,7 +404,8 @@ parse_object (GMarkupParseContext *context,
return;
}
g_hash_table_insert (data->object_ids, object_id, GINT_TO_POINTER (line));
g_hash_table_insert (data->object_ids, g_strdup (object_id), GINT_TO_POINTER (line));
}
static void
@ -1128,7 +1129,8 @@ _gtk_builder_parser_parse_buffer (GtkBuilder *builder,
data->builder = builder;
data->filename = filename;
data->domain = g_strdup (domain);
data->object_ids = g_hash_table_new (g_str_hash, g_str_equal);
data->object_ids = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify)g_free, NULL);
data->requested_objects = NULL;
if (requested_objs)

9
gtk/tests/builder.c
View File

@ -116,6 +116,13 @@ test_parser (void)
GTK_BUILDER_ERROR_INVALID_VALUE));
g_error_free (error);
error = NULL;
gtk_builder_add_from_string (builder, "<interface><object class=\"GtkButton\" id=\"a\"></object><object class=\"GtkButton\" id=\"a\"/></object></interface>", -1, &error);
g_assert (g_error_matches (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_DUPLICATE_ID));
g_error_free (error);
g_object_unref (builder);
}
@ -2172,7 +2179,7 @@ test_add_objects (void)
" </object>"
" <object class=\"GtkWindow\" id=\"window2\">"
" <child>"
" <object class=\"GtkLabel\" id=\"label1\">"
" <object class=\"GtkLabel\" id=\"label3\">"
" <property name=\"label\" translatable=\"no\">second label</property>"
" </object>"
" </child>"