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 611405 part 2 - Avoid crash in nsMemoryReporterManager when jemalloc_stats is not available at runtime. r=bsmedberg,a=clegnitto

Browse Source
This commit is contained in:
Mike Hommey 2010-11-17 09:56:19 +01:00
parent 580a41a089
commit ffc922a1d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xpcom/base/nsMemoryReporterManager.cpp
View File

@ -59,10 +59,6 @@
// with it. So if we tried to use jemalloc_stats directly here, it // with it. So if we tried to use jemalloc_stats directly here, it
// wouldn't be defined. Instead, we don't include the jemalloc header // wouldn't be defined. Instead, we don't include the jemalloc header
// and weakly link against jemalloc_stats. // and weakly link against jemalloc_stats.
//
// NB: we don't null-check this symbol at runtime because we expect it
// to have been resolved. If it hasn't, the crash jumping to NULL
// will indicate the bug.
extern "C" { extern "C" {
extern void jemalloc_stats(jemalloc_stats_t* stats) extern void jemalloc_stats(jemalloc_stats_t* stats)
NS_VISIBILITY_DEFAULT __attribute__((weak)); NS_VISIBILITY_DEFAULT __attribute__((weak));
@ -219,6 +215,10 @@ NS_IMPL_ISUPPORTS1(nsMemoryReporterManager, nsIMemoryReporterManager)
NS_IMETHODIMP NS_IMETHODIMP
nsMemoryReporterManager::Init() nsMemoryReporterManager::Init()
{ {
#if HAVE_JEMALLOC_STATS && defined(XP_LINUX)
if (!jemalloc_stats)
return NS_ERROR_FAILURE;
#endif
/* /*
* Register our core reporters * Register our core reporters
*/ */