wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RT4047: Set reference count earlier

Browse source 
Make sure it's valid very early.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Filipe DA SILVA 2015-09-16 22:25:31 -04:00 committed by Rich Salz
parent 20ca916d7d
commit 0e04674e96
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crypto/asn1/x_pkey.c
View file

@ -70,11 +70,12 @@ X509_PKEY *X509_PKEY_new(void)
if (!ret)
goto err;
ret->references = 1;
ret->enc_algor = X509_ALGOR_new();
ret->enc_pkey = ASN1_OCTET_STRING_new();
if (!ret->enc_algor || !ret->enc_pkey)
goto err;
ret->references = 1;
return ret;
err:
X509_PKEY_free(ret);

2
ssl/ssl_cert.c
View file

@ -192,6 +192,7 @@ CERT *ssl_cert_dup(CERT *cert)
return (NULL);
}
ret->references = 1;
ret->key = &ret->pkeys[cert->key - cert->pkeys];
#ifndef OPENSSL_NO_RSA
@ -278,7 +279,6 @@ CERT *ssl_cert_dup(CERT *cert)
}
}
ret->references = 1;
/* Configured sigalgs copied across */
if (cert->conf_sigalgs) {
ret->conf_sigalgs = OPENSSL_malloc(cert->conf_sigalgslen);

2
ssl/ssl_lib.c
View file

@ -286,6 +286,7 @@ SSL *SSL_new(SSL_CTX *ctx)
s->options = ctx->options;
s->mode = ctx->mode;
s->max_cert_list = ctx->max_cert_list;
s->references = 1;
/*
* Earlier library versions used to copy the pointer to the CERT, not
@ -372,7 +373,6 @@ SSL *SSL_new(SSL_CTX *ctx)
if (!s->method->ssl_new(s))
goto err;
s->references = 1;
s->server = (ctx->method->ssl_accept == ssl_undefined_function) ? 0 : 1;
if (!SSL_clear(s))