Bug 1593426 - Fix a case missed in bug 1587162. r=erahm
authorNicholas Nethercote <nnethercote@mozilla.com>
Tue, 05 Nov 2019 00:14:28 +0000
changeset 500498 4d585c7edc7683e4b35eca6b18c9a646a1b8a78d
parent 500497 1dd79924a920934999b6f5e7d50b4c42dff6d5ce
child 500499 27be25a455011635616815a9f2b798e4227bb712
child 500830 c4a3bbc944a3f1d003bae9137595d5298f226a46
push id99645
push usernnethercote@mozilla.com
push dateTue, 05 Nov 2019 01:57:57 +0000
treeherderautoland@4d585c7edc76 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerserahm
bugs1593426, 1587162
milestone72.0a1
first release with
nightly linux32
4d585c7edc76 / 72.0a1 / 20191105095755 / files
nightly linux64
4d585c7edc76 / 72.0a1 / 20191105095755 / files
nightly mac
4d585c7edc76 / 72.0a1 / 20191105095755 / files
nightly win32
4d585c7edc76 / 72.0a1 / 20191105095755 / files
nightly win64
4d585c7edc76 / 72.0a1 / 20191105095755 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1593426 - Fix a case missed in bug 1587162. r=erahm This code is compiled when `MOZ_NEW_CERT_STORAGE` is not defined, which is the case on beta. Differential Revision: https://phabricator.services.mozilla.com/D51559
security/manager/ssl/CertBlocklist.h
--- a/security/manager/ssl/CertBlocklist.h
+++ b/security/manager/ssl/CertBlocklist.h
@@ -73,17 +73,17 @@ class CertBlocklist : public nsICertBloc
   bool mModified;
   bool mBackingFileIsInitialized;
   // call EnsureBackingFileInitialized before operations that read or
   // modify CertBlocklist data
   nsresult EnsureBackingFileInitialized(mozilla::MutexAutoLock& lock);
   nsCOMPtr<nsIFile> mBackingFile;
 
  protected:
-  static void PreferenceChanged(const char* aPref, CertBlocklist* aBlocklist);
+  static void PreferenceChanged(const char* aPref, void* aBlocklist);
   static uint32_t sLastBlocklistUpdate;
   static uint32_t sLastKintoUpdate;
   static uint32_t sMaxStaleness;
   static bool sUseAMO;
   virtual ~CertBlocklist();
 };
 
 #endif  // CertBlocklist_h