Bug 1056941 - Fix dangerous destructors in Fennec code; r=blassey

dothq · Aug 26, 2014 · 3dcbdea · 3dcbdea
1 parent c8e5c6d
commit 3dcbdea
Show file tree

Hide file tree

Showing 22 changed files with 72 additions and 19 deletions.
diff --git a/dom/mobilemessage/src/android/MobileMessageDatabaseService.h b/dom/mobilemessage/src/android/MobileMessageDatabaseService.h
@@ -15,6 +15,9 @@ namespace mobilemessage {
 
 class MobileMessageDatabaseService MOZ_FINAL : public nsIMobileMessageDatabaseService
 {
+private:
+  ~MobileMessageDatabaseService() {}
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIMOBILEMESSAGEDATABASESERVICE

diff --git a/dom/mobilemessage/src/android/SmsService.h b/dom/mobilemessage/src/android/SmsService.h
@@ -14,6 +14,9 @@ namespace mobilemessage {
 
 class SmsService MOZ_FINAL : public nsISmsService
 {
+private:
+  ~SmsService() {}
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISMSSERVICE

diff --git a/dom/system/android/nsHapticFeedback.h b/dom/system/android/nsHapticFeedback.h
@@ -7,6 +7,9 @@
 
 class nsHapticFeedback MOZ_FINAL : public nsIHapticFeedback
 {
+private:
+  ~nsHapticFeedback() {}
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIHAPTICFEEDBACK

diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -44,6 +44,9 @@ static FT_Library gPlatformFTLibrary = nullptr;
 class FreetypeReporter MOZ_FINAL : public nsIMemoryReporter,
                                    public CountingAllocatorBase<FreetypeReporter>
 {
+private:
+    ~FreetypeReporter() {}
+
 public:
     NS_DECL_ISUPPORTS
 

diff --git a/image/decoders/icon/android/nsIconChannel.h b/image/decoders/icon/android/nsIconChannel.h
@@ -25,15 +25,17 @@ class nsIconChannel MOZ_FINAL : public nsIChannel {
     NS_FORWARD_NSICHANNEL(mRealChannel->)
 
     nsIconChannel() {}
-    ~nsIconChannel() {}
 
     /**
      * Called by nsIconProtocolHandler after it creates this channel.
      * Must be called before calling any other function on this object.
      * If this method fails, no other function must be called on this object.
      */
     nsresult Init(nsIURI* aURI);
+
   private:
+    ~nsIconChannel() {}
+
     /**
      * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
      * Will always be non-null after a successful Init.

diff --git a/mobile/android/components/build/nsShellService.h b/mobile/android/components/build/nsShellService.h
@@ -15,11 +15,10 @@ class nsShellService MOZ_FINAL : public nsIShellService
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
 
-  nsShellService() {};
+  nsShellService() {}
 
 private:
-  ~nsShellService() {};
-
+  ~nsShellService() {}
 };
 
 #define nsShellService_CID                          \

diff --git a/netwerk/base/src/Tickler.cpp b/netwerk/base/src/Tickler.cpp
@@ -225,9 +225,9 @@ class TicklerTimer MOZ_FINAL : public nsITimerCallback
     mTickler = do_GetWeakReference(aTickler);
   }
 
-  ~TicklerTimer() {};
-
 private:
+  ~TicklerTimer() {}
+
   nsWeakPtr mTickler;
 };
 

diff --git a/netwerk/protocol/device/AndroidCaptureProvider.h b/netwerk/protocol/device/AndroidCaptureProvider.h
@@ -17,9 +17,11 @@
 #include "mozilla/ReentrantMonitor.h"
 
 class AndroidCaptureProvider MOZ_FINAL : public nsDeviceCaptureProvider {
+  private:
+    ~AndroidCaptureProvider();
+
   public:
     AndroidCaptureProvider();
-    ~AndroidCaptureProvider();
 
     NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -28,9 +30,11 @@ class AndroidCaptureProvider MOZ_FINAL : public nsDeviceCaptureProvider {
 };
 
 class AndroidCameraInputStream MOZ_FINAL : public nsIAsyncInputStream, mozilla::net::CameraStreamImpl::FrameCallback {
+  private:
+    ~AndroidCameraInputStream();
+
   public:
     AndroidCameraInputStream();
-    ~AndroidCameraInputStream();
 
     NS_IMETHODIMP Init(nsACString& aContentType, nsCaptureParams* aParams);
 

diff --git a/netwerk/system/android/nsAndroidNetworkLinkService.h b/netwerk/system/android/nsAndroidNetworkLinkService.h
@@ -16,6 +16,8 @@ class nsAndroidNetworkLinkService: public nsINetworkLinkService
   NS_DECL_NSINETWORKLINKSERVICE
 
   nsAndroidNetworkLinkService();
+
+private:
   virtual ~nsAndroidNetworkLinkService();
 };
 

diff --git a/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp b/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp
@@ -26,7 +26,7 @@ class nsAndroidSystemProxySettings : public nsISystemProxySettings
     nsresult Init();
 
 private:
-    ~nsAndroidSystemProxySettings() {};
+    virtual ~nsAndroidSystemProxySettings() {}
 };
 
 NS_IMPL_ISUPPORTS(nsAndroidSystemProxySettings, nsISystemProxySettings)

diff --git a/uriloader/exthandler/android/nsAndroidHandlerApp.h b/uriloader/exthandler/android/nsAndroidHandlerApp.h
@@ -15,14 +15,14 @@ class nsAndroidHandlerApp : public nsISharingHandlerApp {
     NS_DECL_NSIHANDLERAPP
     NS_DECL_NSISHARINGHANDLERAPP
 
-    public:
     nsAndroidHandlerApp(const nsAString& aName, const nsAString& aDescription,
                         const nsAString& aPackageName, 
                         const nsAString& aClassName, 
                         const nsACString& aMimeType, const nsAString& aAction);
-    virtual ~nsAndroidHandlerApp();
 
 private:
+    virtual ~nsAndroidHandlerApp();
+
     nsString mName;
     nsString mDescription;
     nsString mPackageName;

diff --git a/uriloader/exthandler/android/nsMIMEInfoAndroid.h b/uriloader/exthandler/android/nsMIMEInfoAndroid.h
@@ -30,7 +30,9 @@ class nsMIMEInfoAndroid MOZ_FINAL : public nsIMIMEInfo
 
   nsMIMEInfoAndroid(const nsACString& aMIMEType);
 
-protected:
+private:
+  ~nsMIMEInfoAndroid() {}
+
   virtual nsresult LaunchDefaultWithFile(nsIFile* aFile);
   virtual nsresult LoadUriInternal(nsIURI *aURI);
   nsCOMPtr<nsIMutableArray> mHandlerApps;
@@ -40,16 +42,18 @@ class nsMIMEInfoAndroid MOZ_FINAL : public nsIMIMEInfo
   nsHandlerInfoAction mPrefAction;
   nsString mDescription;
   nsCOMPtr<nsIHandlerApp> mPrefApp;
-
+
+public:
   class SystemChooser MOZ_FINAL : public nsIHandlerApp {
   public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIHANDLERAPP
-    SystemChooser(nsMIMEInfoAndroid* aOuter): mOuter(aOuter) {};
-    
+    SystemChooser(nsMIMEInfoAndroid* aOuter): mOuter(aOuter) {}
+
   private:
+    ~SystemChooser() {}
+
     nsMIMEInfoAndroid* mOuter;
-
   };
 };
 

diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp
@@ -115,6 +115,10 @@ GfxInfo::GfxInfo()
 {
 }
 
+GfxInfo::~GfxInfo()
+{
+}
+
 /* GetD2DEnabled and GetDwriteEnabled shouldn't be called until after gfxPlatform initialization
  * has occurred because they depend on it for information. (See bug 591561) */
 nsresult

diff --git a/widget/android/GfxInfo.h b/widget/android/GfxInfo.h
@@ -24,6 +24,9 @@ namespace widget {
 
 class GfxInfo : public GfxInfoBase
 {
+private:
+  ~GfxInfo();
+
 public:
   GfxInfo();
 

diff --git a/widget/android/nsAndroidProtocolHandler.cpp b/widget/android/nsAndroidProtocolHandler.cpp
@@ -25,11 +25,15 @@ class AndroidInputStream : public nsIInputStream
         mBridgeInputStream = env->NewGlobalRef(GeckoAppShell::CreateInputStream(connection));
         mBridgeChannel = env->NewGlobalRef(AndroidBridge::ChannelCreate(mBridgeInputStream));
     }
+
+private:
     virtual ~AndroidInputStream() {
         JNIEnv *env = GetJNIForThread();
         env->DeleteGlobalRef(mBridgeInputStream);
         env->DeleteGlobalRef(mBridgeChannel);
     }
+
+public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIINPUTSTREAM
 

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

diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp
@@ -111,7 +111,10 @@ class ThumbnailRunnable : public nsRunnable {
 };
 
 class WakeLockListener MOZ_FINAL : public nsIDOMMozWakeLockListener {
- public:
+private:
+  ~WakeLockListener() {}
+
+public:
   NS_DECL_ISUPPORTS;
 
   nsresult Callback(const nsAString& topic, const nsAString& state) {

diff --git a/widget/android/nsClipboard.h b/widget/android/nsClipboard.h
@@ -10,6 +10,9 @@
 
 class nsClipboard MOZ_FINAL : public nsIClipboard
 {
+private:
+  ~nsClipboard() {}
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSICLIPBOARD

diff --git a/widget/android/nsDeviceContextAndroid.h b/widget/android/nsDeviceContextAndroid.h
@@ -7,6 +7,9 @@
 
 class nsDeviceContextSpecAndroid MOZ_FINAL : public nsIDeviceContextSpec
 {
+private:
+    ~nsDeviceContextSpecAndroid() {}
+
 public:
     NS_DECL_ISUPPORTS
 

diff --git a/widget/android/nsScreenManagerAndroid.h b/widget/android/nsScreenManagerAndroid.h
@@ -30,9 +30,11 @@ class nsScreenAndroid MOZ_FINAL : public nsBaseScreen
 
 class nsScreenManagerAndroid MOZ_FINAL : public nsIScreenManager
 {
+private:
+    ~nsScreenManagerAndroid();
+
 public:
     nsScreenManagerAndroid();
-    ~nsScreenManagerAndroid();
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSISCREENMANAGER

diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
@@ -87,6 +87,10 @@ static StaticRefPtr<ContentCreationNotifier> gContentCreationNotifier;
 // are created. Currently an update for the screen size is sent.
 class ContentCreationNotifier MOZ_FINAL : public nsIObserver
 {
+private:
+    ~ContentCreationNotifier() {}
+
+public:
     NS_DECL_ISUPPORTS
 
     NS_IMETHOD Observe(nsISupports* aSubject,

diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h
@@ -32,11 +32,13 @@ namespace mozilla {
 class nsWindow :
     public nsBaseWidget
 {
+private:
+    virtual ~nsWindow();
+
 public:
     using nsBaseWidget::GetLayerManager;
 
     nsWindow();
-    virtual ~nsWindow();
 
     NS_DECL_ISUPPORTS_INHERITED