Attachment 8920640 Details for Bug 1408017

[patch] Clear gStartupCacheWrapper in the dtor.

Bug-1408017---Clear-gStartupCacheWrapper-in-the-dt.patch (text/plain), 1.63 KB, created by Andrew McCreight [:mccr8]

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew McCreight [:mccr8]

Size: 1.63 KB

patch

obsolete

># HG changeset patch
># User Andrew McCreight <continuation@gmail.com>
>
>Bug 1408017 - Clear gStartupCacheWrapper in the dtor. r=froydnj
>
>diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp
>index 6650161..4d71fd4 100644
>--- a/startupcache/StartupCache.cpp
>+++ b/startupcache/StartupCache.cpp
>@@ -695,16 +695,22 @@ StartupCacheDebugOutputStream::PutBuffer(char* aBuffer, uint32_t aLength)
>   mBinaryStream->PutBuffer(aBuffer, aLength);
> }
> #endif //DEBUG
> 
> StartupCacheWrapper* StartupCacheWrapper::gStartupCacheWrapper = nullptr;
> 
> NS_IMPL_ISUPPORTS(StartupCacheWrapper, nsIStartupCache)
> 
>+StartupCacheWrapper::~StartupCacheWrapper()
>+{
>+  MOZ_ASSERT(gStartupCacheWrapper == this);
>+  gStartupCacheWrapper = nullptr;
>+}
>+
> StartupCacheWrapper* StartupCacheWrapper::GetSingleton()
> {
>   if (!gStartupCacheWrapper)
>     gStartupCacheWrapper = new StartupCacheWrapper();
> 
>   NS_ADDREF(gStartupCacheWrapper);
>   return gStartupCacheWrapper;
> }
>diff --git a/startupcache/StartupCache.h b/startupcache/StartupCache.h
>index 2835595..e663765 100644
>--- a/startupcache/StartupCache.h
>+++ b/startupcache/StartupCache.h
>@@ -204,17 +204,17 @@ class StartupCacheDebugOutputStream final
> #define NS_STARTUPCACHE_CID \
>       {0xae4505a9, 0x87ab, 0x477c, \
>       {0xb5, 0x77, 0xf9, 0x23, 0x57, 0xed, 0xa8, 0x84}}
> // contract id: "@mozilla.org/startupcache/cache;1"
> 
> class StartupCacheWrapper final
>   : public nsIStartupCache
> {
>-  ~StartupCacheWrapper() {}
>+  ~StartupCacheWrapper();
> 
>   NS_DECL_THREADSAFE_ISUPPORTS
>   NS_DECL_NSISTARTUPCACHE
> 
>   static StartupCacheWrapper* GetSingleton();
>   static StartupCacheWrapper *gStartupCacheWrapper;
> };
>

Flags:

froydnj: review+
ritu: approval-mozilla-esr52+
abillings: sec-approval+

Actions: View | Diff | Review

Attachments on bug 1408017: 8920312 | 8920343 | 8920640

Bugzilla

Quick Search

Attachment 8920640 Details for Bug 1408017