summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/objects
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2016-09-22 15:55:27 +0000
committerjkim <jkim@FreeBSD.org>2016-09-22 15:55:27 +0000
commit3599587ae793583e28ee9f173cd8fd9a871306f3 (patch)
treec5dc8fe4f348f5db5683bbe8d4f3413a7440b924 /crypto/openssl/crypto/objects
parent73e9e3e293d8e68ffafc5d04f0cc74a824c84185 (diff)
downloadFreeBSD-src-3599587ae793583e28ee9f173cd8fd9a871306f3.zip
FreeBSD-src-3599587ae793583e28ee9f173cd8fd9a871306f3.tar.gz
MFS: r306195
Merge OpenSSL 1.0.2i. Approved by: re (gjb, implicit), so (delphij)
Diffstat (limited to 'crypto/openssl/crypto/objects')
-rw-r--r--crypto/openssl/crypto/objects/o_names.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssl/crypto/objects/o_names.c b/crypto/openssl/crypto/objects/o_names.c
index 2485992..f106905 100644
--- a/crypto/openssl/crypto/objects/o_names.c
+++ b/crypto/openssl/crypto/objects/o_names.c
@@ -191,7 +191,7 @@ int OBJ_NAME_add(const char *name, int type, const char *data)
onp = (OBJ_NAME *)OPENSSL_malloc(sizeof(OBJ_NAME));
if (onp == NULL) {
/* ERROR */
- return (0);
+ return 0;
}
onp->name = name;
@@ -216,10 +216,11 @@ int OBJ_NAME_add(const char *name, int type, const char *data)
} else {
if (lh_OBJ_NAME_error(names_lh)) {
/* ERROR */
- return (0);
+ OPENSSL_free(onp);
+ return 0;
}
}
- return (1);
+ return 1;
}
int OBJ_NAME_remove(const char *name, int type)
OpenPOWER on IntegriCloud