Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 01:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

symtab: fix some leaks

Browse Source 
* src/symlist.c (symbol_list_free): Deep free it.
* src/symtab.c (symbols_free, semantic_types_sorted): Free it too.
(symbols_do, sorted): Call by address.
This commit is contained in:
Theophile Ranquet
2012-12-11 13:16:22 +01:00
parent be27db79a5
commit ae9c90ba00
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/symlist.c
View File

@@ -119,6 +119,8 @@ symbol_list_free (symbol_list *list)
{ {
next = node->next; next = node->next;
named_ref_free (node->named_ref); named_ref_free (node->named_ref);
if (node->content_type == SYMLIST_TYPE)
free (node->content.sem_type);
free (node); free (node);
} }
} }

23
src/symtab.c
View File

@@ -801,6 +801,7 @@ symbols_free (void)
hash_free (semantic_type_table); hash_free (semantic_type_table);
free (symbols); free (symbols);
free (symbols_sorted); free (symbols_sorted);
free (semantic_types_sorted);
} }
@@ -823,19 +824,19 @@ symbols_cmp_qsort (void const *a, void const *b)
static void static void
symbols_do (Hash_processor processor, void *processor_data, symbols_do (Hash_processor processor, void *processor_data,
struct hash_table *table, symbol **sorted) struct hash_table *table, symbol ***sorted)
{ {
size_t count = hash_get_n_entries (table); size_t count = hash_get_n_entries (table);
if (!sorted) if (!*sorted)
{ {
sorted = xnmalloc (count, sizeof *sorted); *sorted = xnmalloc (count, sizeof **sorted);
hash_get_entries (table, (void**)sorted, count); hash_get_entries (table, (void**)*sorted, count);
qsort (sorted, count, sizeof *sorted, symbols_cmp_qsort); qsort (*sorted, count, sizeof **sorted, symbols_cmp_qsort);
} }
{ {
size_t i; size_t i;
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
processor (sorted[i], processor_data); processor ((*sorted)[i], processor_data);
} }
} }
@@ -848,9 +849,9 @@ void
symbols_check_defined (void) symbols_check_defined (void)
{ {
symbols_do (symbol_check_defined_processor, NULL, symbols_do (symbol_check_defined_processor, NULL,
symbol_table, symbols_sorted); symbol_table, &symbols_sorted);
symbols_do (semantic_type_check_defined_processor, NULL, symbols_do (semantic_type_check_defined_processor, NULL,
semantic_type_table, semantic_types_sorted); semantic_type_table, &semantic_types_sorted);
} }
/*------------------------------------------------------------------. /*------------------------------------------------------------------.
@@ -905,7 +906,7 @@ symbols_token_translations_init (void)
for (i = 0; i < max_user_token_number + 1; i++) for (i = 0; i < max_user_token_number + 1; i++)
token_translations[i] = undeftoken->number; token_translations[i] = undeftoken->number;
symbols_do (symbol_translation_processor, NULL, symbols_do (symbol_translation_processor, NULL,
symbol_table, symbols_sorted); symbol_table, &symbols_sorted);
} }
@@ -918,10 +919,10 @@ void
symbols_pack (void) symbols_pack (void)
{ {
symbols_do (symbol_check_alias_consistency_processor, NULL, symbols_do (symbol_check_alias_consistency_processor, NULL,
symbol_table, symbols_sorted); symbol_table, &symbols_sorted);
symbols = xcalloc (nsyms, sizeof *symbols); symbols = xcalloc (nsyms, sizeof *symbols);
symbols_do (symbol_pack_processor, NULL, symbol_table, symbols_sorted); symbols_do (symbol_pack_processor, NULL, symbol_table, &symbols_sorted);
/* Aliases leave empty slots in symbols, so remove them. */ /* Aliases leave empty slots in symbols, so remove them. */
{ {