luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix management of ParseContext.includes_modules (#560419)

Browse Source 
Fix some trivial bugs in managing the list of include modules.
(Add to module's list twice, not initialized to NULL, not freed.)

svn path=/trunk/; revision=905
This commit is contained in:
Owen Taylor 2008-11-12 17:17:08 +00:00
parent b1c6e64049
commit 9a36a18939
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
girparser.c
View File

@ -2479,9 +2479,11 @@ start_element_handler (GMarkupParseContext *context,
for (l = ctx->include_modules; l; l = l->next) for (l = ctx->include_modules; l; l = l->next)
g_ir_module_add_include_module (ctx->current_module, l->data); g_ir_module_add_include_module (ctx->current_module, l->data);
g_list_free (ctx->include_modules);
ctx->include_modules = NULL;
ctx->modules = g_list_append (ctx->modules, ctx->current_module); ctx->modules = g_list_append (ctx->modules, ctx->current_module);
ctx->current_module->dependencies = ctx->dependencies; ctx->current_module->dependencies = ctx->dependencies;
ctx->current_module->include_modules = g_list_copy (ctx->include_modules);
state_switch (ctx, STATE_NAMESPACE); state_switch (ctx, STATE_NAMESPACE);
goto out; goto out;
@ -3028,6 +3030,7 @@ g_ir_parser_parse_string (GIrParser *parser,
ctx.parser = parser; ctx.parser = parser;
ctx.state = STATE_START; ctx.state = STATE_START;
ctx.namespace = namespace; ctx.namespace = namespace;
ctx.include_modules = NULL;
ctx.aliases = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); ctx.aliases = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
ctx.disguised_structures = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); ctx.disguised_structures = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
ctx.type_depth = 0; ctx.type_depth = 0;
@ -3055,12 +3058,14 @@ g_ir_parser_parse_string (GIrParser *parser,
if (ctx.modules == NULL) if (ctx.modules == NULL)
{ {
/* If we have a module, then ownership is transferred to the module */ /* An error occurred before we created a module, so we haven't
* transferred ownership of these hash tables to the module.
*/
if (ctx.aliases != NULL) if (ctx.aliases != NULL)
g_hash_table_destroy (ctx.aliases); g_hash_table_destroy (ctx.aliases);
if (ctx.disguised_structures != NULL) if (ctx.disguised_structures != NULL)
g_hash_table_destroy (ctx.disguised_structures); g_hash_table_destroy (ctx.disguised_structures);
g_list_free (ctx.include_modules);
} }
g_markup_parse_context_free (context); g_markup_parse_context_free (context);