[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  98e4c100d2cd33f3be24b1210f403ef1a41fa36a (commit)
      from  7e454ca3660af9416dcea0195ebe86fc3ff2fd80 (commit)


- Log -----------------------------------------------------------------
commit 98e4c100d2cd33f3be24b1210f403ef1a41fa36a
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 12 15:24:29 2018 +0000

    Free the correct type in OBJ_add_object()
    
    We should be using ASN1_OBJECT_free() not OPENSSL_free().
    
    Fixes #5568
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5598)

-----------------------------------------------------------------------

Summary of changes:
 crypto/objects/obj_dat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 53109ac..9be8a7b 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -213,8 +213,8 @@ int OBJ_add_object(const ASN1_OBJECT *obj)
  err:
     for (i = ADDED_DATA; i <= ADDED_NID; i++)
         OPENSSL_free(ao[i]);
-    OPENSSL_free(o);
-    return (NID_undef);
+    ASN1_OBJECT_free(o);
+    return NID_undef;
 }
 
 ASN1_OBJECT *OBJ_nid2obj(int n)