Bug 1028588 - Fix dangerous public destructors in miscellaneous place…

…s - r=ehsan
Brli · Jun 23, 2014 · 0a40ab9 · 0a40ab9
1 parent dac776f
commit 0a40ab9
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 8 deletions.
diff --git a/browser/components/about/AboutRedirector.h b/browser/components/about/AboutRedirector.h
@@ -18,12 +18,12 @@ class AboutRedirector : public nsIAboutModule
   NS_DECL_NSIABOUTMODULE
 
   AboutRedirector() {}
-  virtual ~AboutRedirector() {}
 
   static nsresult
     Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
 protected:
+  virtual ~AboutRedirector() {}
 };
 
 } // namespace browser

diff --git a/browser/components/dirprovider/DirectoryProvider.h b/browser/components/dirprovider/DirectoryProvider.h
@@ -25,6 +25,8 @@ class DirectoryProvider MOZ_FINAL : public nsIDirectoryServiceProvider2
   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
 
 private:
+  ~DirectoryProvider() {}
+
   class AppendingEnumerator MOZ_FINAL : public nsISimpleEnumerator
   {
   public:
@@ -35,6 +37,8 @@ class DirectoryProvider MOZ_FINAL : public nsIDirectoryServiceProvider2
                         char const *const *aAppendList);
 
   private:
+    ~AppendingEnumerator() {}
+
     nsCOMPtr<nsISimpleEnumerator> mBase;
     char const *const *const      mAppendList;
     nsCOMPtr<nsIFile>             mNext;

diff --git a/browser/components/feeds/src/nsFeedSniffer.h b/browser/components/feeds/src/nsFeedSniffer.h
@@ -26,6 +26,8 @@ class nsFeedSniffer MOZ_FINAL : public nsIContentSniffer,
                                          uint32_t* writeCount);
 
 protected:
+  ~nsFeedSniffer() {}
+
   nsresult ConvertEncodedData(nsIRequest* request, const uint8_t* data,
                               uint32_t length);
 

diff --git a/caps/include/DomainPolicy.h b/caps/include/DomainPolicy.h
@@ -19,9 +19,10 @@ class DomainPolicy : public nsIDomainPolicy
     NS_DECL_ISUPPORTS
     NS_DECL_NSIDOMAINPOLICY
     DomainPolicy();
-    virtual ~DomainPolicy();
 
 private:
+    virtual ~DomainPolicy();
+
     nsCOMPtr<nsIDomainSet> mBlacklist;
     nsCOMPtr<nsIDomainSet> mSuperBlacklist;
     nsCOMPtr<nsIDomainSet> mWhitelist;
@@ -35,9 +36,9 @@ class DomainSet : public nsIDomainSet
     NS_DECL_NSIDOMAINSET
 
     DomainSet() {}
-    virtual ~DomainSet() {}
 
 protected:
+    virtual ~DomainSet() {}
     nsTHashtable<nsURIHashKey> mHashTable;
 };
 

diff --git a/caps/src/nsNullPrincipalURI.h b/caps/src/nsNullPrincipalURI.h
@@ -37,6 +37,8 @@ class nsNullPrincipalURI MOZ_FINAL : public nsIURI
   nsNullPrincipalURI(const nsCString &aSpec);
 
 private:
+  ~nsNullPrincipalURI() {}
+
   nsCString mScheme;
   nsCString mPath;
 };

diff --git a/chrome/src/nsChromeProtocolHandler.h b/chrome/src/nsChromeProtocolHandler.h
@@ -29,6 +29,8 @@ class nsChromeProtocolHandler MOZ_FINAL : public nsIProtocolHandler,
 
     // nsChromeProtocolHandler methods:
     nsChromeProtocolHandler() {}
+
+private:
     ~nsChromeProtocolHandler() {}
 };
 

diff --git a/chrome/src/nsChromeRegistry.h b/chrome/src/nsChromeRegistry.h
@@ -60,7 +60,6 @@ class nsChromeRegistry : public nsIToolkitChromeRegistry,
 
   // nsChromeRegistry methods:
   nsChromeRegistry() : mInitialized(false) { }
-  virtual ~nsChromeRegistry();
 
   virtual nsresult Init();
 
@@ -71,6 +70,8 @@ class nsChromeRegistry : public nsIToolkitChromeRegistry,
   static nsresult Canonify(nsIURL* aChromeURL);
 
 protected:
+  virtual ~nsChromeRegistry();
+
   void FlushSkinCaches();
   void FlushAllCaches();
 

diff --git a/hal/HalWakeLock.cpp b/hal/HalWakeLock.cpp
@@ -97,6 +97,7 @@ RemoveChildFromList(const nsAString& aKey, nsAutoPtr<ProcessLockTable>& aTable,
 }
 
 class ClearHashtableOnShutdown MOZ_FINAL : public nsIObserver {
+  ~ClearHashtableOnShutdown() {}
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
@@ -116,6 +117,7 @@ ClearHashtableOnShutdown::Observe(nsISupports* aSubject, const char* aTopic, con
 }
 
 class CleanupOnContentShutdown MOZ_FINAL : public nsIObserver {
+  ~CleanupOnContentShutdown() {}
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER

diff --git a/services/crypto/component/nsSyncJPAKE.h b/services/crypto/component/nsSyncJPAKE.h
@@ -20,6 +20,7 @@ class nsSyncJPAKE : public nsISyncJPAKE
   NS_DECL_ISUPPORTS
   NS_DECL_NSISYNCJPAKE
   nsSyncJPAKE();
+protected:
   virtual ~nsSyncJPAKE();
 private:
   enum { JPAKENotStarted, JPAKEBeforeRound2, JPAKEAfterRound2 } round;

diff --git a/startupcache/StartupCache.h b/startupcache/StartupCache.h
@@ -93,6 +93,7 @@ struct CacheEntry
 // refcount its listeners, so we'll let it refcount this instead.
 class StartupCacheListener MOZ_FINAL : public nsIObserver
 {
+  ~StartupCacheListener() {}
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIOBSERVER
 };
@@ -187,7 +188,9 @@ friend class StartupCacheWrapper;
 #ifdef DEBUG
 class StartupCacheDebugOutputStream MOZ_FINAL
   : public nsIObjectOutputStream
-{  
+{
+  ~StartupCacheDebugOutputStream() {}
+
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBJECTOUTPUTSTREAM
 
@@ -214,6 +217,8 @@ class StartupCacheDebugOutputStream MOZ_FINAL
 class StartupCacheWrapper MOZ_FINAL
   : public nsIStartupCache
 {
+  ~StartupCacheWrapper() {}
+
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSISTARTUPCACHE
 

diff --git a/tools/profiler/SaveProfileTask.h b/tools/profiler/SaveProfileTask.h
@@ -43,10 +43,10 @@ class ProfileSaveEvent MOZ_FINAL : public nsIProfileSaveEvent {
     , mClosure(aClosure)
   {}
 
-  ~ProfileSaveEvent() {}
-
   NS_IMETHOD AddSubProfile(const char* aProfile);
 private:
+  ~ProfileSaveEvent() {}
+
   AddSubProfileFunc mFunc;
   void* mClosure;
 };

diff --git a/tools/profiler/nsProfiler.h b/tools/profiler/nsProfiler.h
@@ -14,14 +14,14 @@ class nsProfiler MOZ_FINAL : public nsIProfiler, public nsIObserver
 {
 public:
     nsProfiler();
-    ~nsProfiler();
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIOBSERVER
     NS_DECL_NSIPROFILER
 
     nsresult Init();
 private:
+    ~nsProfiler();
     bool mLockedForPrivateBrowsing;
 };