From 3dcbdea53a1b05d13dc4e4d979915b51a55c3b04 Mon Sep 17 00:00:00 2001 From: Jim Chen Date: Tue, 26 Aug 2014 15:07:59 -0400 Subject: [PATCH] Bug 1056941 - Fix dangerous destructors in Fennec code; r=blassey --- .../src/android/MobileMessageDatabaseService.h | 3 +++ dom/mobilemessage/src/android/SmsService.h | 3 +++ dom/system/android/nsHapticFeedback.h | 3 +++ gfx/thebes/gfxAndroidPlatform.cpp | 3 +++ image/decoders/icon/android/nsIconChannel.h | 4 +++- mobile/android/components/build/nsShellService.h | 5 ++--- netwerk/base/src/Tickler.cpp | 4 ++-- netwerk/protocol/device/AndroidCaptureProvider.h | 8 ++++++-- .../system/android/nsAndroidNetworkLinkService.h | 2 ++ .../androidproxy/nsAndroidSystemProxySettings.cpp | 2 +- uriloader/exthandler/android/nsAndroidHandlerApp.h | 4 ++-- uriloader/exthandler/android/nsMIMEInfoAndroid.h | 14 +++++++++----- widget/android/GfxInfo.cpp | 4 ++++ widget/android/GfxInfo.h | 3 +++ widget/android/nsAndroidProtocolHandler.cpp | 4 ++++ widget/android/nsAndroidProtocolHandler.h | 2 ++ widget/android/nsAppShell.cpp | 5 ++++- widget/android/nsClipboard.h | 3 +++ widget/android/nsDeviceContextAndroid.h | 3 +++ widget/android/nsScreenManagerAndroid.h | 4 +++- widget/android/nsWindow.cpp | 4 ++++ widget/android/nsWindow.h | 4 +++- 22 files changed, 72 insertions(+), 19 deletions(-) diff --git a/dom/mobilemessage/src/android/MobileMessageDatabaseService.h b/dom/mobilemessage/src/android/MobileMessageDatabaseService.h index cf7191d4931d..269a599bca83 100644 --- 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 index 7a1a4d438b85..daddf377536a 100644 --- 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 index 426bf17ff717..a8a9903f1aa7 100644 --- 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 index f12e4c9b60e7..8b2f2c00296f 100644 --- 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 { +private: + ~FreetypeReporter() {} + public: NS_DECL_ISUPPORTS diff --git a/image/decoders/icon/android/nsIconChannel.h b/image/decoders/icon/android/nsIconChannel.h index f3540fd52097..2ae2a385a594 100644 --- a/image/decoders/icon/android/nsIconChannel.h +++ b/image/decoders/icon/android/nsIconChannel.h @@ -25,7 +25,6 @@ class nsIconChannel MOZ_FINAL : public nsIChannel { NS_FORWARD_NSICHANNEL(mRealChannel->) nsIconChannel() {} - ~nsIconChannel() {} /** * Called by nsIconProtocolHandler after it creates this channel. @@ -33,7 +32,10 @@ class nsIconChannel MOZ_FINAL : public nsIChannel { * 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 index f80569d48931..5663b773ab99 100644 --- a/mobile/android/components/build/nsShellService.h +++ b/mobile/android/components/build/nsShellService.h @@ -15,11 +15,10 @@ public: 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 index bc56effbfcac..dc9c29f6fe46 100644 --- 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 index 92f7cb141c6c..03f02870979f 100644 --- 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 index 2fbfdf806aba..9fdda7cae052 100644 --- a/netwerk/system/android/nsAndroidNetworkLinkService.h +++ b/netwerk/system/android/nsAndroidNetworkLinkService.h @@ -16,6 +16,8 @@ public: NS_DECL_NSINETWORKLINKSERVICE nsAndroidNetworkLinkService(); + +private: virtual ~nsAndroidNetworkLinkService(); }; diff --git a/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp b/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp index 5a98be32ce47..4b6bbcb30ce9 100644 --- a/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp +++ b/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp @@ -26,7 +26,7 @@ public: 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 index ad828b1137c2..bb38724638ab 100644 --- a/uriloader/exthandler/android/nsAndroidHandlerApp.h +++ b/uriloader/exthandler/android/nsAndroidHandlerApp.h @@ -15,14 +15,14 @@ public: 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 index 33339603131f..af732dbb52a3 100644 --- a/uriloader/exthandler/android/nsMIMEInfoAndroid.h +++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.h @@ -30,7 +30,9 @@ public: nsMIMEInfoAndroid(const nsACString& aMIMEType); -protected: +private: + ~nsMIMEInfoAndroid() {} + virtual nsresult LaunchDefaultWithFile(nsIFile* aFile); virtual nsresult LoadUriInternal(nsIURI *aURI); nsCOMPtr mHandlerApps; @@ -40,16 +42,18 @@ protected: nsHandlerInfoAction mPrefAction; nsString mDescription; nsCOMPtr 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 index d94e0a2d43a6..4ab9da311ede 100644 --- 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 index 47bd64346374..0112ef4b96fd 100644 --- 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 index 7c1d9357d1cc..189470ed2c31 100644 --- a/widget/android/nsAndroidProtocolHandler.cpp +++ b/widget/android/nsAndroidProtocolHandler.cpp @@ -25,11 +25,15 @@ public: 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 index 6c9552de45a0..68af2a97df5e 100644 --- a/widget/android/nsAndroidProtocolHandler.h +++ b/widget/android/nsAndroidProtocolHandler.h @@ -29,6 +29,8 @@ public: // nsAndroidProtocolHandler methods: nsAndroidProtocolHandler() {} + +private: ~nsAndroidProtocolHandler() {} }; diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp index 23bb8c9887fa..222bf3ff0a2b 100644 --- a/widget/android/nsAppShell.cpp +++ b/widget/android/nsAppShell.cpp @@ -111,7 +111,10 @@ private: }; 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 index fae02f6f63e2..17faca0c3bb7 100644 --- 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 index cac5f5eb8d95..1addb1cb84fb 100644 --- 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 index a07976ef7777..d7e2e1be4981 100644 --- a/widget/android/nsScreenManagerAndroid.h +++ b/widget/android/nsScreenManagerAndroid.h @@ -30,9 +30,11 @@ protected: 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 index 622ba0fea406..9ef305188d47 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -87,6 +87,10 @@ static StaticRefPtr 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 index 3c105be2dbd2..7c80ddd29344 100644 --- 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