From: Naveed Khan <dxbnaveed.k@gmail.com>
Date: Sat, 4 Jul 2026 17:09:47 +0000 (+0530)
Subject: pkcs12: free PKCS7 elements on error in PKCS12_unpack_authsafes
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b1393a04464eaf8b769bb6dc606d36a7734e73aa;p=thirdparty%2Fopenssl.git

pkcs12: free PKCS7 elements on error in PKCS12_unpack_authsafes

Fixes: b536880c4572 "Add library context and property query support into the PKCS12 API"

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Fri Jul 10 15:48:37 2026
(Merged from https://github.com/openssl/openssl/pull/31862)
---

diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index 8ea41676d80..12173177837 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -219,6 +219,6 @@ STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12)
     }
     return p7s;
 err:
-    sk_PKCS7_free(p7s);
+    sk_PKCS7_pop_free(p7s, PKCS7_free);
     return NULL;
 }