]> granicus.if.org Git - openssl/commitdiff
Added error checking for OBJ_create
authorFrank Morgner <frankmorgner@gmail.com>
Mon, 10 Apr 2017 12:15:09 +0000 (14:15 +0200)
committerRich Salz <rsalz@openssl.org>
Tue, 11 Apr 2017 23:16:17 +0000 (19:16 -0400)
fixes segmentation fault in case of not enough memory for object creation

CLA: trivial

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3157)
(cherry picked from commit 487a73def65aa6ffedf5baf353e912fe61aa3c7c)

crypto/objects/obj_dat.c

index 259851bc00960a86b3201da8d1c7504e36ace5ff..9f3741778a2a1774bee33969c7d8e506ca7fa65b 100644 (file)
@@ -692,6 +692,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) {