denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backtrace: Remove name checks after SymFromAddr() calls

Browse Source 
The Name member is an array whose address is always defined.
This commit is contained in:
Tobias Brunner
2014-07-02 12:11:59 +02:00
parent fbe462e1b0
commit 0e48f67562
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/backtrace.c
+5 -9
View File
@@ -492,8 +492,7 @@ METHOD(backtrace_t, log_, void,
if (module && GetModuleFileName(module, filename, sizeof(filename))) if (module && GetModuleFileName(module, filename, sizeof(filename)))
{ {
if (SymFromAddr(process, frame, &displace, &symbol.hdr) && if (SymFromAddr(process, frame, &displace, &symbol.hdr))
symbol.hdr.Name)
{ {
println(file, " %s%s%s @ %p (%s%s%s+0x%tx) [%p]", println(file, " %s%s%s @ %p (%s%s%s+0x%tx) [%p]",
esc(file, TTY_FG_YELLOW), filename, esc(file, TTY_FG_YELLOW), filename,
@@ -615,15 +614,12 @@ METHOD(backtrace_t, contains_function, bool,
if (SymFromAddr(process, (DWORD64)this->frames[i], NULL, &symbol.hdr)) if (SymFromAddr(process, (DWORD64)this->frames[i], NULL, &symbol.hdr))
{ {
if (symbol.hdr.Name) for (j = 0; j < count; j++)
{ {
for (j = 0; j < count; j++) if (streq(symbol.hdr.Name, function[j]))
{ {
if (streq(symbol.hdr.Name, function[j])) dbghelp_mutex->unlock(dbghelp_mutex);
{ return TRUE;
dbghelp_mutex->unlock(dbghelp_mutex);
return TRUE;
}
} }
} }
} }