From bb03547b02dedcc50bf851250715dda4ac1e32f2 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@wgate.com>
Date: Thu, 16 Dec 2021 18:42:58 +0000
Subject: [PATCH] Bug 1746430: URLClassifier cleanup r=dimi

Differential Revision: https://phabricator.services.mozilla.com/D134029
---
 toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp | 2 ++
 toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
index 9b75df44bf1b..26b26b48828c 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
@@ -447,6 +447,8 @@ nsresult nsUrlClassifierPrefixSet::LoadPrefixes(nsCOMPtr<nsIInputStream>& in) {
 
 uint32_t nsUrlClassifierPrefixSet::CalculatePreallocateSize() const {
   uint32_t fileSize = 4 * sizeof(uint32_t);
+  MutexAutoLock lock(mLock);
+
   MOZ_RELEASE_ASSERT(mTotalPrefixes >= mIndexPrefixes.Length());
   uint32_t deltas = mTotalPrefixes - mIndexPrefixes.Length();
   fileSize += mIndexPrefixes.Length() * sizeof(uint32_t);
diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
index 51f3d9ef18f9..722b5077fbd0 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
+++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
@@ -79,7 +79,7 @@ class nsUrlClassifierPrefixSet final : public nsIUrlClassifierPrefixSet {
   // how many prefixes we have.
   uint32_t mTotalPrefixes;
 
-  nsCString mName;
+  nsCString mName;  // Set in Init() only
   mozilla::CorruptionCanary mCanary;
 };