Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- more safe way to accumulate stack trace and not run out of buffer space.

This commit is contained in:
Mark Vejvoda 2012-07-17 23:36:00 +00:00
parent 9f0546c008
commit a55397c5f6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/shared_lib/sources/platform/sdl/platform_util.cpp
View File

@ -186,6 +186,7 @@ string PlatformExceptionHandler::getStackTrace() {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
char szBuf[8096]="";
string strBuf = "";
for(size_t i = 1; i < stack_depth; i++) {
void *lineAddress = stack_addrs[i]; //getStackAddress(stackIndex);
@ -223,15 +224,22 @@ string PlatformExceptionHandler::getStackTrace() {
}
//fprintf(out, " %s:%s\n", stack.strings[i], function);
sprintf(szBuf,"%s:%s address [%p]",stack_strings[i],function,lineAddress);
//sprintf(szBuf,"%s:%s address [%p]",stack_strings[i],function,lineAddress);
strBuf = string(stack_strings[i]) + ":" + string(function);
sprintf(szBuf,"address [%p]",lineAddress);
strBuf += szBuf;
}
else {
// didn't find the mangled name, just print the whole line
//fprintf(out, " %s\n", stack.strings[i]);
sprintf(szBuf,"%s address [%p]",stack_strings[i],lineAddress);
//sprintf(szBuf,"%s address [%p]",stack_strings[i],lineAddress);
strBuf = stack_strings[i];
sprintf(szBuf,"address [%p]",lineAddress);
strBuf += szBuf;
}
errMsg += string(szBuf);
//errMsg += string(szBuf);
errMsg += strBuf;
char file[8096]="";
int line = getFileAndLine(function, lineAddress, file, 8096);
if(line >= 0) {