wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 755724 - Initialize trace malloc before calling NS_NewLocalFile in nsBrowserApp.cpp. r=bsmedberg

Browse Source
This commit is contained in:
Mike Hommey 2013-01-19 09:40:02 +01:00
parent d564033cc7
commit 7bad077c55
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
browser/app/nsBrowserApp.cpp
View File

@ -92,16 +92,6 @@ static bool IsArg(const char* arg, const char* s)
return false;
}
/**
* A helper class which calls NS_LogInit/NS_LogTerm in its scope.
*/
class ScopedLogging
{
public:
ScopedLogging() { NS_LogInit(); }
~ScopedLogging() { NS_LogTerm(); }
};
XRE_GetFileFromPathType XRE_GetFileFromPath;
XRE_CreateAppDataType XRE_CreateAppData;
XRE_FreeAppDataType XRE_FreeAppData;
@ -315,14 +305,16 @@ InitXPCOMGlue(const char *argv0, nsIFile **xreDirectory)
return rv;
}
NS_LogInit();
// chop XPCOM_DLL off exePath
*lastSlash = '\0';
#ifdef XP_WIN
NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false,
xreDirectory);
rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false,
xreDirectory);
#else
NS_NewNativeLocalFile(nsDependentCString(exePath), false,
xreDirectory);
rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false,
xreDirectory);
#endif
return rv;
@ -382,11 +374,9 @@ int main(int argc, char* argv[])
#endif
}
int result;
{
ScopedLogging log;
result = do_main(argc, argv, xreDirectory);
}
int result = do_main(argc, argv, xreDirectory);
NS_LogTerm();
#ifdef XP_MACOSX
// Allow writes again. While we would like to catch writes from static