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

dbghelp: Ensure we can try to load COFF symbols if none is found in other debug formats.

This commit is contained in:
Eric Pouech 2010-06-26 22:54:07 +02:00 committed by Alexandre Julliard
parent d97e6a47e5
commit 3ced7b8f40
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/dbghelp/dwarf.c
View File

@ -3077,10 +3077,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset,
struct module_format* dwarf2_modfmt; struct module_format* dwarf2_modfmt;
if (!dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect)) if (!dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect))
{ /* no Dwarf debug info here */
/* no Dwarf debug info here, so there's no error */ return FALSE;
return TRUE;
}
dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect);
dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect);
dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect);

4
dlls/dbghelp/pe_module.c
View File

@ -183,8 +183,8 @@ static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void*
/* is the iSym table inside file size ? (including first DWORD of string table, which is its size) */ /* is the iSym table inside file size ? (including first DWORD of string table, which is its size) */
offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable; offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable;
offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL) + sizeof(DWORD); offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL);
if (offset > sz) return FALSE; if (offset + sizeof(DWORD) > sz) return FALSE;
/* is string table (following iSym table) inside file size ? */ /* is string table (following iSym table) inside file size ? */
offset += *(DWORD*)((const char*)mapping + offset); offset += *(DWORD*)((const char*)mapping + offset);
return offset <= sz; return offset <= sz;