aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/x509v3/v3_alt.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-06-15 20:18:50 +0200
committermarha <marha@users.sourceforge.net>2015-06-15 20:18:50 +0200
commit5fe210ff514aa4b3149ea7561862776d7b8849e7 (patch)
treee03de3521d40e559090e665d6dc46cd03c0d877c /openssl/crypto/x509v3/v3_alt.c
parent843964ee791452b197e41dacb0146f5b456ffaa5 (diff)
downloadvcxsrv-5fe210ff514aa4b3149ea7561862776d7b8849e7.tar.gz
vcxsrv-5fe210ff514aa4b3149ea7561862776d7b8849e7.tar.bz2
vcxsrv-5fe210ff514aa4b3149ea7561862776d7b8849e7.zip
Update to openssl-1.0.2c
Diffstat (limited to 'openssl/crypto/x509v3/v3_alt.c')
-rw-r--r--openssl/crypto/x509v3/v3_alt.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/openssl/crypto/x509v3/v3_alt.c b/openssl/crypto/x509v3/v3_alt.c
index 807867b91..22ec20284 100644
--- a/openssl/crypto/x509v3/v3_alt.c
+++ b/openssl/crypto/x509v3/v3_alt.c
@@ -584,24 +584,26 @@ static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
static int do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
{
- int ret;
- STACK_OF(CONF_VALUE) *sk;
- X509_NAME *nm;
+ int ret = 0;
+ STACK_OF(CONF_VALUE) *sk = NULL;
+ X509_NAME *nm = NULL;
if (!(nm = X509_NAME_new()))
- return 0;
+ goto err;
sk = X509V3_get_section(ctx, value);
if (!sk) {
X509V3err(X509V3_F_DO_DIRNAME, X509V3_R_SECTION_NOT_FOUND);
ERR_add_error_data(2, "section=", value);
- X509_NAME_free(nm);
- return 0;
+ goto err;
}
/* FIXME: should allow other character types... */
ret = X509V3_NAME_from_section(nm, sk, MBSTRING_ASC);
if (!ret)
- X509_NAME_free(nm);
+ goto err;
gen->d.dirn = nm;
- X509V3_section_free(ctx, sk);
+err:
+ if (ret == 0)
+ X509_NAME_free(nm);
+ X509V3_section_free(ctx, sk);
return ret;
}