From be9a6ed2acec811158b236c281007984ce141d28 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Tue, 29 Apr 2025 23:52:20 +0200
Subject: [PATCH] [NSS] Improve locking in nssPKIObject_GetInstances.

---
 security/nss/lib/pki/pkibase.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/nss/lib/pki/pkibase.c b/security/nss/lib/pki/pkibase.c
index f58a262cf2..22159773a8 100644
--- a/security/nss/lib/pki/pkibase.c
+++ b/security/nss/lib/pki/pkibase.c
@@ -333,10 +333,11 @@ nssPKIObject_GetInstances(
 {
     nssCryptokiObject **instances = NULL;
     PRUint32 i;
+    nssPKIObject_Lock(object);
     if (object->numInstances == 0) {
+        nssPKIObject_Unlock(object);
         return (nssCryptokiObject **)NULL;
     }
-    nssPKIObject_Lock(object);
     instances = nss_ZNEWARRAY(NULL, nssCryptokiObject *,
                               object->numInstances + 1);
     if (instances) {