luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-03 06:13:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Calculate size correctly, avoid use-after-free.

Browse Source 
2008-08-20  Colin Walters  <walters@verbum.org>

	* girepository/girmodule.c (g_ir_module_build_typelib):
	Calculate size correctly, avoid use-after-free.

svn path=/trunk/; revision=427
This commit is contained in:
Colin Walters 2008-08-21 00:42:23 +00:00 committed by Colin Walters
parent 61ae81c9c8
commit ae74722007
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
girmodule.c
View File

@ -64,7 +64,7 @@ GTypelib *
g_ir_module_build_typelib (GIrModule *module, g_ir_module_build_typelib (GIrModule *module,
GList *modules) GList *modules)
{ {
guchar *typelib; GTypelib *typelib;
gsize length; gsize length;
gint i; gint i;
GList *e; GList *e;
@ -102,6 +102,11 @@ g_ir_module_build_typelib (GIrModule *module,
size += g_ir_node_get_full_size (node); size += g_ir_node_get_full_size (node);
} }
/* Adjust size for strings allocated in header below specially */
size += strlen (module->name);
if (module->shared_library)
size += strlen (module->shared_library);
g_message ("allocating %d bytes (%d header, %d directory, %d entries)\n", g_message ("allocating %d bytes (%d header, %d directory, %d entries)\n",
size, header_size, dir_size, size - header_size - dir_size); size, header_size, dir_size, size - header_size - dir_size);
@ -201,15 +206,19 @@ g_ir_module_build_typelib (GIrModule *module,
} }
dump_stats (); dump_stats ();
g_hash_table_destroy (strings);
g_hash_table_destroy (types);
header->annotations = offset2; header->annotations = offset2;
g_message ("reallocating to %d bytes", offset2); g_message ("reallocating to %d bytes", offset2);
typelib = g_realloc (data, offset2); data = g_realloc (data, offset2);
header = (Header*) data;
length = header->size = offset2; length = header->size = offset2;
return g_typelib_new_from_memory (typelib, length); typelib = g_typelib_new_from_memory (data, length);
g_hash_table_destroy (strings);
g_hash_table_destroy (types);
return typelib;
} }