[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  487a73def65aa6ffedf5baf353e912fe61aa3c7c (commit)
      from  a105d5603bcb93597866ab20a0ef2acaf6e7b3f6 (commit)


- Log -----------------------------------------------------------------
commit 487a73def65aa6ffedf5baf353e912fe61aa3c7c
Author: Frank Morgner <frankmorgner at gmail.com>
Date:   Mon Apr 10 14:15:09 2017 +0200

    Added error checking for OBJ_create
    
    fixes segmentation fault in case of not enough memory for object creation
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3157)

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

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

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index f37e947..2f86cd5 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -691,6 +691,8 @@ int OBJ_create(const char *oid, const char *sn, const char *ln)
 
     /* Convert numerical OID string to an ASN1_OBJECT structure */
     tmpoid = OBJ_txt2obj(oid, 1);
+    if (tmpoid == NULL)
+        return 0;
 
     /* If NID is not NID_undef then object already exists */
     if (OBJ_obj2nid(tmpoid) != NID_undef) {