[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c130c0fe1d386fcc05d5b7accf062fe72b7272e8 (commit)
      from  61cd0c946b34b6ae690882b334d77093e063d47c (commit)


- Log -----------------------------------------------------------------
commit c130c0fe1d386fcc05d5b7accf062fe72b7272e8
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/5597)

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

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

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 06a3fb3..f4412f6 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -213,7 +213,7 @@ int OBJ_add_object(const ASN1_OBJECT *obj)
  err:
     for (i = ADDED_DATA; i <= ADDED_NID; i++)
         OPENSSL_free(ao[i]);
-    OPENSSL_free(o);
+    ASN1_OBJECT_free(o);
     return NID_undef;
 }