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

crypto/x509/x509_vpm.c: Simplify int_x509_param_set1()

Browse source 
This change also avoids calling strlen twice when srclen is 0

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Kurt Cancemi 2016-05-26 16:38:31 -04:00 committed by Matt Caswell
parent e2bb9b9bf3
commit 01d0e241dc
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crypto/x509/x509_vpm.c
View file

@ -259,12 +259,11 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen,
{
void *tmp;
if (src) {
if (srclen == 0) {
tmp = OPENSSL_strdup(src);
if (srclen == 0)
srclen = strlen(src);
} else
tmp = OPENSSL_memdup(src, srclen);
if (!tmp)
tmp = OPENSSL_memdup(src, srclen);
if (tmp == NULL)
return 0;
} else {
tmp = NULL;
@ -272,7 +271,7 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen,
}
OPENSSL_free(*pdest);
*pdest = tmp;
if (pdestlen)
if (pdestlen != NULL)
*pdestlen = srclen;
return 1;
}