MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix leak of symbol name in block_symbol_cache

Browse Source 
A symbol not found inserted in the cache has a xstrdup-ed name
that must be freed, but only the struct block_symbol_cache is freed.
Add a function destroy_block_symbol_cache that clears all slots
before releasing the cache.

2019-12-03  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
	* symtab.c (symbol_cache_clear_slot):  Move close to cleared type.
	(destroy_block_symbol_cache): New function.
	(symbol_cache:~symbol_cache) Call destroy_block_symbol_cache.
	(resize_symbol_cache): Likewise.
This commit is contained in:
Philippe Waroquiers 2019-12-01 17:24:41 +01:00
parent e63ef0954d
commit 82f910ea9c
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2019-12-03 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* symtab.c (symbol_cache_clear_slot): Move close to cleared type.
(destroy_block_symbol_cache): New function.
(symbol_cache:~symbol_cache) Call destroy_block_symbol_cache.
(resize_symbol_cache): Likewise.
2019-12-02 Tom Tromey <tom@tromey.com> 2019-12-02 Tom Tromey <tom@tromey.com>
* unittests/tui-selftests.c (run_tests): Make conditional. * unittests/tui-selftests.c (run_tests): Make conditional.

41
gdb/symtab.c
View File

@ -183,6 +183,16 @@ struct symbol_cache_slot
} value; } value;
}; };
/* Clear out SLOT. */
static void
symbol_cache_clear_slot (struct symbol_cache_slot *slot)
{
if (slot->state == SYMBOL_SLOT_NOT_FOUND)
xfree (slot->value.not_found.name);
slot->state = SYMBOL_SLOT_UNUSED;
}
/* Symbols don't specify global vs static block. /* Symbols don't specify global vs static block.
So keep them in separate caches. */ So keep them in separate caches. */
@ -201,6 +211,19 @@ struct block_symbol_cache
struct symbol_cache_slot symbols[1]; struct symbol_cache_slot symbols[1];
}; };
/* Clear all slots of BSC and free BSC. */
static void
destroy_block_symbol_cache (struct block_symbol_cache *bsc)
{
if (bsc != nullptr)
{
for (unsigned int i = 0; i < bsc->size; i++)
symbol_cache_clear_slot (&bsc->symbols[i]);
xfree (bsc);
}
}
/* The symbol cache. /* The symbol cache.
Searching for symbols in the static and global blocks over multiple objfiles Searching for symbols in the static and global blocks over multiple objfiles
@ -217,8 +240,8 @@ struct symbol_cache
~symbol_cache () ~symbol_cache ()
{ {
xfree (global_symbols); destroy_block_symbol_cache (global_symbols);
xfree (static_symbols); destroy_block_symbol_cache (static_symbols);
} }
struct block_symbol_cache *global_symbols = nullptr; struct block_symbol_cache *global_symbols = nullptr;
@ -1234,8 +1257,8 @@ resize_symbol_cache (struct symbol_cache *cache, unsigned int new_size)
&& new_size == 0)) && new_size == 0))
return; return;
xfree (cache->global_symbols); destroy_block_symbol_cache (cache->global_symbols);
xfree (cache->static_symbols); destroy_block_symbol_cache (cache->static_symbols);
if (new_size == 0) if (new_size == 0)
{ {
@ -1373,16 +1396,6 @@ symbol_cache_lookup (struct symbol_cache *cache,
return {}; return {};
} }
/* Clear out SLOT. */
static void
symbol_cache_clear_slot (struct symbol_cache_slot *slot)
{
if (slot->state == SYMBOL_SLOT_NOT_FOUND)
xfree (slot->value.not_found.name);
slot->state = SYMBOL_SLOT_UNUSED;
}
/* Mark SYMBOL as found in SLOT. /* Mark SYMBOL as found in SLOT.
OBJFILE_CONTEXT is the current objfile when the lookup was done, or NULL OBJFILE_CONTEXT is the current objfile when the lookup was done, or NULL
if it's not needed to distinguish lookups (STATIC_BLOCK). It is *not* if it's not needed to distinguish lookups (STATIC_BLOCK). It is *not*