Bug 1028588 - Fix dangerous public destructors in toolkit/ - r=ehsan

Author: Benoit Jacob

toolkit/components/alerts/nsAlertsService.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+// /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -36,9 +36,10 @@ class nsAlertsService : public nsIAlertsService,
   NS_DECL_ISUPPORTS
 
   nsAlertsService();
-  virtual ~nsAlertsService();
 
 protected:
+  virtual ~nsAlertsService();
+
   bool ShouldShowAlert();
   nsXULAlerts mXULAlerts;
 };

toolkit/components/alerts/nsXULAlerts.h

@@ -49,8 +49,9 @@ class nsXULAlertObserver : public nsIObserver {
 
   void SetAlertWindow(nsIDOMWindow* aWindow) { mAlertWindow = aWindow; }
 
-  virtual ~nsXULAlertObserver() {}
 protected:
+  virtual ~nsXULAlertObserver() {}
+
   nsXULAlerts* mXULAlerts;
   nsString mAlertName;
   nsCOMPtr<nsIDOMWindow> mAlertWindow;

toolkit/components/autocomplete/nsAutoCompleteController.h

@@ -35,9 +35,10 @@ class nsAutoCompleteController : public nsIAutoCompleteController,
   NS_DECL_NSITIMERCALLBACK
 
   nsAutoCompleteController();
-  virtual ~nsAutoCompleteController();
 
 protected:
+  virtual ~nsAutoCompleteController();
+
   nsresult OpenPopup();
   nsresult ClosePopup();
 

toolkit/components/downloads/ApplicationReputation.cpp

@@ -84,7 +84,6 @@ class PendingLookup MOZ_FINAL : public nsIStreamListener
   // Constructor and destructor.
   PendingLookup(nsIApplicationReputationQuery* aQuery,
                 nsIApplicationReputationCallback* aCallback);
-  ~PendingLookup();
 
   // Start the lookup. The lookup may have 2 parts: local and remote. In the
   // local lookup, PendingDBLookups are created to query the local allow and
@@ -94,6 +93,8 @@ class PendingLookup MOZ_FINAL : public nsIStreamListener
   nsresult StartLookup();
 
 private:
+  ~PendingLookup();
+
   friend class PendingDBLookup;
 
   // Telemetry states.
@@ -210,13 +211,15 @@ class PendingDBLookup MOZ_FINAL : public nsIUrlClassifierCallback
 
   // Constructor and destructor
   PendingDBLookup(PendingLookup* aPendingLookup);
-  ~PendingDBLookup();
 
   // Look up the given URI in the safebrowsing DBs, optionally on both the allow
   // list and the blocklist. If there is a match, call
   // PendingLookup::OnComplete. Otherwise, call PendingLookup::LookupNext.
   nsresult LookupSpec(const nsACString& aSpec, bool aAllowlistOnly);
+
 private:
+  ~PendingDBLookup();
+
   // The download appeared on the allowlist, blocklist, or no list (and thus
   // could trigger a remote query.
   enum LIST_TYPES {

toolkit/components/downloads/SQLFunctions.h

@@ -24,6 +24,7 @@ namespace downloads {
  */
 class GenerateGUIDFunction MOZ_FINAL : public mozIStorageFunction
 {
+  ~GenerateGUIDFunction() {}
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_MOZISTORAGEFUNCTION

toolkit/components/downloads/nsDownloadManager.h

@@ -53,7 +53,6 @@ class nsDownloadManager : public nsIDownloadManager,
 
   static nsDownloadManager *GetSingleton();
 
-  virtual ~nsDownloadManager();
   nsDownloadManager()
 #ifdef DOWNLOAD_SCANNER
     : mScanner(nullptr)
@@ -62,6 +61,8 @@ class nsDownloadManager : public nsIDownloadManager,
   }
 
 protected:
+  virtual ~nsDownloadManager();
+
   nsresult InitDB();
   nsresult InitFileDB();
   void CloseAllDBs();
@@ -273,7 +274,6 @@ class nsDownload : public nsIDownload
   NS_DECL_ISUPPORTS
 
   nsDownload();
-  virtual ~nsDownload();
 
   /**
    * This method MUST be called when changing states on a download.  It will
@@ -283,6 +283,8 @@ class nsDownload : public nsIDownload
   nsresult SetState(DownloadState aState);
 
 protected:
+  virtual ~nsDownload();
+
   /**
    * Finish up the download by breaking reference cycles and clearing unneeded
    * data. Additionally, the download removes itself from the download

toolkit/components/downloads/nsDownloadProxy.h

@@ -23,10 +23,13 @@
 // deriving from nsISupports will throw ambiguous base class errors.
 class nsDownloadProxy : public nsITransfer
 {
+protected:
+
+  virtual ~nsDownloadProxy() { }
+
 public:
 
   nsDownloadProxy() { }
-  virtual ~nsDownloadProxy() { }
 
   NS_DECL_ISUPPORTS
 

toolkit/components/filepicker/nsFileView.cpp

@@ -47,6 +47,8 @@ class nsFileResult MOZ_FINAL : public nsIAutoCompleteResult
   nsTArray<nsString> mValues;
   nsAutoString mSearchString;
   uint16_t mSearchResult;
+private:
+  ~nsFileResult() {}
 };
 
 NS_IMPL_ISUPPORTS(nsFileResult, nsIAutoCompleteResult)
@@ -185,6 +187,7 @@ NS_IMETHODIMP nsFileResult::RemoveValueAt(int32_t rowIndex, bool removeFromDb)
 
 class nsFileComplete MOZ_FINAL : public nsIAutoCompleteSearch
 {
+  ~nsFileComplete() {}
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIAUTOCOMPLETESEARCH

toolkit/components/finalizationwitness/FinalizationWitnessService.h

@@ -18,6 +18,7 @@ class FinalizationWitnessService MOZ_FINAL : public nsIFinalizationWitnessServic
   NS_DECL_ISUPPORTS
   NS_DECL_NSIFINALIZATIONWITNESSSERVICE
  private:
+  ~FinalizationWitnessService() {}
   void operator=(const FinalizationWitnessService* other) MOZ_DELETE;
 };
 

toolkit/components/find/nsFindService.h

@@ -27,14 +27,15 @@ class nsFindService : public nsIFindService
 {
 public:
 
-                      nsFindService();
-  virtual             ~nsFindService();
+  nsFindService();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIFINDSERVICE
 
 protected:
 
+  virtual ~nsFindService();
+
   nsString        mSearchString;
   nsString        mReplaceString;