From: Nicola Tuveri <nic.tuv@gmail.com>
Date: Sun, 28 Jun 2020 14:07:59 +0000 (+0300)
Subject: Fix memory leaks on OSSL_SERIALIZER_CTX_new_by_EVP_PKEY
X-Git-Tag: openssl-3.0.0-alpha5~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=587e4e53f886cd4d7a8b0eb063b823409e2ed4b9;p=thirdparty%2Fopenssl.git

Fix memory leaks on OSSL_SERIALIZER_CTX_new_by_EVP_PKEY

Fixes #12303

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12304)
---

diff --git a/crypto/serializer/serializer_pkey.c b/crypto/serializer/serializer_pkey.c
index d6120702403..1e7fc3eafbd 100644
--- a/crypto/serializer/serializer_pkey.c
+++ b/crypto/serializer/serializer_pkey.c
@@ -292,8 +292,6 @@ OSSL_SERIALIZER_CTX *OSSL_SERIALIZER_CTX_new_by_EVP_PKEY(const EVP_PKEY *pkey,
         const OSSL_PROVIDER *desired_prov = EVP_KEYMGMT_provider(keymgmt);
         OPENSSL_CTX *libctx = ossl_provider_library_context(desired_prov);
         struct selected_serializer_st sel_data;
-        OSSL_PROPERTY_LIST *check = ossl_parse_query(libctx, "type=parameters");
-        OSSL_PROPERTY_LIST *current_props = NULL;
         OSSL_SERIALIZER *first = NULL;
         const char *name;
         int i;
@@ -347,6 +345,9 @@ OSSL_SERIALIZER_CTX *OSSL_SERIALIZER_CTX_new_by_EVP_PKEY(const EVP_PKEY *pkey,
             ser = first;
 
         if (ser != NULL) {
+            OSSL_PROPERTY_LIST *check = NULL, *current_props = NULL;
+
+            check = ossl_parse_query(libctx, "type=parameters");
             current_props =
                 ossl_parse_property(libctx, OSSL_SERIALIZER_properties(ser));
             if (ossl_property_match_count(check, current_props) > 0)