From 0e48f67562ba266fa6edbdeb7dc76efd7c33b872 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 2 Jul 2014 11:31:56 +0200 Subject: [PATCH] backtrace: Remove name checks after SymFromAddr() calls The Name member is an array whose address is always defined. --- src/libstrongswan/utils/backtrace.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libstrongswan/utils/backtrace.c b/src/libstrongswan/utils/backtrace.c index 65e74160b..e694caec7 100644 --- a/src/libstrongswan/utils/backtrace.c +++ b/src/libstrongswan/utils/backtrace.c @@ -492,8 +492,7 @@ METHOD(backtrace_t, log_, void, if (module && GetModuleFileName(module, filename, sizeof(filename))) { - if (SymFromAddr(process, frame, &displace, &symbol.hdr) && - symbol.hdr.Name) + if (SymFromAddr(process, frame, &displace, &symbol.hdr)) { println(file, " %s%s%s @ %p (%s%s%s+0x%tx) [%p]", 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 (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; } } }