From 9892072ed8d2e5ea9481e7db9911cbae09b4cfc1 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 26 Jan 2021 23:47:03 +0100
Subject: Added fix for mozbz#1679933 - startup crash

---
 mozilla-1679933.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 mozilla-1679933.patch

(limited to 'mozilla-1679933.patch')

diff --git a/mozilla-1679933.patch b/mozilla-1679933.patch
new file mode 100644
index 0000000..f49a24c
--- /dev/null
+++ b/mozilla-1679933.patch
@@ -0,0 +1,16 @@
+diff --git a/netwerk/base/nsNetUtil.cpp b/netwerk/base/nsNetUtil.cpp
+--- a/netwerk/base/nsNetUtil.cpp
++++ b/netwerk/base/nsNetUtil.cpp
+@@ -2714,9 +2714,8 @@
+   MOZ_ASSERT(XRE_IsParentProcess());
+   MOZ_ASSERT(NS_IsMainThread());
+ 
+-  nsresult rv;
+-  nsCOMPtr<nsISupports> psm = do_GetService(PSM_COMPONENT_CONTRACTID, &rv);
+-  MOZ_ASSERT(NS_SUCCEEDED(rv));
++  DebugOnly<bool> rv = EnsureNSSInitializedChromeOrContent();
++  MOZ_ASSERT(rv);
+ 
+ #ifndef MOZ_NEW_CERT_STORAGE
+   nsCOMPtr<nsISupports> cbl = do_GetService(NS_CERTBLOCKLIST_CONTRACTID);
+
-- 
cgit