ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Use the correct size for global variable when searching for a symbol.

This commit is contained in:
Eric Pouech 2008-09-06 22:20:06 +02:00 committed by Alexandre Julliard
parent a181ad5a2c
commit 5ad756fb3c
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/dbghelp/symbol.c
View File

@ -715,6 +715,18 @@ static BOOL resort_symbols(struct module* module)
return module->sortlist_valid = TRUE; return module->sortlist_valid = TRUE;
} }
static void symt_get_length(struct symt* symt, ULONG64* size)
{
DWORD type_index;
if (symt_get_info(symt, TI_GET_LENGTH, size) && *size)
return;
if (symt_get_info(symt, TI_GET_TYPE, &type_index) &&
symt_get_info((struct symt*)type_index, TI_GET_LENGTH, size)) return;
*size = 0x1000; /* arbitrary value */
}
/* assume addr is in module */ /* assume addr is in module */
struct symt_ht* symt_find_nearest(struct module* module, DWORD addr) struct symt_ht* symt_find_nearest(struct module* module, DWORD addr)
{ {
@ -737,8 +749,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD addr)
if (high) if (high)
{ {
symt_get_info(&module->addr_sorttab[high - 1]->symt, TI_GET_ADDRESS, &ref_addr); symt_get_info(&module->addr_sorttab[high - 1]->symt, TI_GET_ADDRESS, &ref_addr);
if (!symt_get_info(&module->addr_sorttab[high - 1]->symt, TI_GET_LENGTH, &ref_size) || !ref_size) symt_get_length(&module->addr_sorttab[high - 1]->symt, &ref_size);
ref_size = 0x1000; /* arbitrary value */
if (addr >= ref_addr + ref_size) return NULL; if (addr >= ref_addr + ref_size) return NULL;
} }
@ -772,8 +783,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD addr)
/* finally check that we fit into the found symbol */ /* finally check that we fit into the found symbol */
symt_get_info(&module->addr_sorttab[low]->symt, TI_GET_ADDRESS, &ref_addr); symt_get_info(&module->addr_sorttab[low]->symt, TI_GET_ADDRESS, &ref_addr);
if (addr < ref_addr) return NULL; if (addr < ref_addr) return NULL;
if (!symt_get_info(&module->addr_sorttab[high - 1]->symt, TI_GET_LENGTH, &ref_size) || !ref_size) symt_get_length(&module->addr_sorttab[low]->symt, &ref_size);
ref_size = 0x1000; /* arbitrary value */
if (addr >= ref_addr + ref_size) return NULL; if (addr >= ref_addr + ref_size) return NULL;
return module->addr_sorttab[low]; return module->addr_sorttab[low];