From c58501deba7359712e47f5af5c9ade2b346f1ca5 Mon Sep 17 00:00:00 2001 From: beck Date: Fri, 7 Jun 2002 03:45:32 +0000 Subject: Merge OpenSSL 0.9.7-stable-20020605, correctly autogenerate obj_mac.h --- lib/libssl/src/crypto/objects/obj_dat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libssl/src/crypto/objects/obj_dat.c') diff --git a/lib/libssl/src/crypto/objects/obj_dat.c b/lib/libssl/src/crypto/objects/obj_dat.c index 8779ba7d1d4..3ff64bb8d13 100644 --- a/lib/libssl/src/crypto/objects/obj_dat.c +++ b/lib/libssl/src/crypto/objects/obj_dat.c @@ -236,7 +236,7 @@ int OBJ_add_object(const ASN1_OBJECT *obj) if (added == NULL) if (!init_added()) return(0); if ((o=OBJ_dup(obj)) == NULL) goto err; - ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); + if (!(ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err; if ((o->length != 0) && (obj->data != NULL)) ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); if (o->sn != NULL) -- cgit v1.2.3-59-g8ed1b