Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 01:57:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 995345 - Improve efficiency of NS_DescribeCodeAddress. r=froydnj

Browse Source 
--HG--
extra : rebase_source : ab839d1898d9fe122f2519a657391437dc7216bc
This commit is contained in:
Eric Rahm 2014-04-14 13:25:04 -07:00
parent 1977552fae
commit ba8b77a271
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xpcom/base/nsStackWalk.cpp
View File

@ -869,10 +869,10 @@ void DemangleSymbol(const char * aSymbol,
#if defined(MOZ_DEMANGLE_SYMBOLS)
/* See demangle.h in the gcc source for the voodoo */
char * demangled = abi::__cxa_demangle(aSymbol,0,0,0);
if (demangled)
{
strncpy(aBuffer,demangled,aBufLen);
PL_strncpyz(aBuffer,demangled,aBufLen);
free(demangled);
}
#endif // MOZ_DEMANGLE_SYMBOLS
@ -1317,21 +1317,17 @@ NS_DescribeCodeAddress(void *aPC, nsCodeAddressDetails *aDetails)
aDetails->loffset = (char*)aPC - (char*)info.dli_fbase;
const char * symbol = info.dli_sname;
int len;
if (!symbol || !(len = strlen(symbol))) {
if (!symbol || symbol[0] == '\0') {
return NS_OK;
}
char demangled[4096] = "\0";
DemangleSymbol(symbol, aDetails->function, sizeof(aDetails->function));
DemangleSymbol(symbol, demangled, sizeof(demangled));
if (strlen(demangled)) {
symbol = demangled;
len = strlen(symbol);
if (aDetails->function[0] == '\0') {
// Just use the mangled symbol if demangling failed.
PL_strncpyz(aDetails->function, symbol, sizeof(aDetails->function));
}
PL_strncpyz(aDetails->function, symbol, sizeof(aDetails->function));
aDetails->foffset = (char*)aPC - (char*)info.dli_saddr;
return NS_OK;
}