From 3d9db9cb381f7e4461708d844cc958cb65a04e56 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 10 Nov 2019 23:58:23 -0500
Subject: Bug 1386601 - experimental patch to investigate Thunderbird topcrash,
 serializes S/MIME verification.

Tag #1273
---
 mailnews/mime/src/nsCMS.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mailnews')

diff --git a/mailnews/mime/src/nsCMS.cpp b/mailnews/mime/src/nsCMS.cpp
index 6717c0840..dd9d31c28 100644
--- a/mailnews/mime/src/nsCMS.cpp
+++ b/mailnews/mime/src/nsCMS.cpp
@@ -24,6 +24,7 @@
 #include "pkix/Result.h"
 #include "pkix/pkixtypes.h"
 #include "smime.h"
+#include "mozilla/StaticMutex.h"
 
 using namespace mozilla;
 using namespace mozilla::psm;
@@ -430,6 +431,7 @@ private:
   {
     MOZ_ASSERT(!NS_IsMainThread());
 
+    mozilla::StaticMutexAutoLock lock(sMutex);
     nsresult rv;
     if (!mDigestData.IsEmpty()) {
       rv = mMessage->VerifyDetachedSignature(
@@ -453,8 +455,12 @@ private:
   nsCOMPtr<nsISMimeVerificationListener> mListener;
   nsCString mDigestData;
   int16_t mDigestType;
+
+  static mozilla::StaticMutex sMutex;
 };
 
+mozilla::StaticMutex SMimeVerificationTask::sMutex;
+
 nsresult nsCMSMessage::CommonAsyncVerifySignature(nsISMimeVerificationListener *aListener,
                                                   unsigned char* aDigestData, uint32_t aDigestDataLen,
                                                   int16_t aDigestType)
-- 
cgit v1.2.3