Commit b1393a0446 for openssl.org
commit b1393a04464eaf8b769bb6dc606d36a7734e73aa
Author: Naveed Khan <dxbnaveed.k@gmail.com>
Date: Sat Jul 4 22:39:47 2026 +0530
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 8ea41676d8..1217317783 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;
}