From 8605abf13523579ecab8b1f2a4bcb8354d94af79 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 10 Jun 2016 15:30:09 +0100 Subject: [PATCH] Fix an error path leak in do_ext_nconf() Reviewed-by: Rich Salz --- crypto/x509v3/v3_conf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c index bc06e31af5..4e118c10ab 100644 --- a/crypto/x509v3/v3_conf.c +++ b/crypto/x509v3/v3_conf.c @@ -88,11 +88,13 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, nval = NCONF_get_section(conf, value + 1); else nval = X509V3_parse_list(value); - if (sk_CONF_VALUE_num(nval) <= 0) { + if (nval == NULL || sk_CONF_VALUE_num(nval) <= 0) { X509V3err(X509V3_F_DO_EXT_NCONF, X509V3_R_INVALID_EXTENSION_STRING); ERR_add_error_data(4, "name=", OBJ_nid2sn(ext_nid), ",section=", value); + if (*value != '@') + sk_CONF_VALUE_free(nval); return NULL; } ext_struc = method->v2i(method, ctx, nval); -- GitLab