From ef525b19c5db068ffebf2651f2ca7d55043d7fd3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 24 Jan 2007 11:49:53 +0000 Subject: [PATCH] fix crash --- stepmania/src/archutils/Unix/BacktraceNames.cpp | 2 +- stepmania/src/archutils/Unix/CrashHandlerChild.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/archutils/Unix/BacktraceNames.cpp b/stepmania/src/archutils/Unix/BacktraceNames.cpp index 32736604c0..f8ffad27a8 100644 --- a/stepmania/src/archutils/Unix/BacktraceNames.cpp +++ b/stepmania/src/archutils/Unix/BacktraceNames.cpp @@ -127,7 +127,7 @@ void BacktraceNames::FromAddr( const void *p ) return; } - Symbol = di.dli_sname; + Symbol = di.dli_sname? di.dli_sname:""; File = di.dli_fname; Offset = (char*)(p)-(char*)di.dli_saddr; } diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp index 258e2ddbad..b26844bf9a 100644 --- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp +++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp @@ -51,7 +51,7 @@ static void output_stack_trace( FILE *out, const void **BacktracePointers ) bn.Demangle(); /* Don't show the main module name. */ - if( bn.File == g_pCrashHandlerArgv0 ) + if( bn.File == g_pCrashHandlerArgv0 && !bn.Symbol.empty() ) bn.File = ""; if( bn.Symbol == "__libc_start_main" )