From: Kurt Cancemi <kurt@x64architecture.com>
Date: Thu, 26 May 2016 20:38:31 +0000 (-0400)
Subject: crypto/x509/x509_vpm.c: Simplify int_x509_param_set1()
X-Git-Tag: OpenSSL_1_1_0-pre6~513
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=01d0e241dc4184a5a1f222f8eccdad11da12305a;p=oweals%2Fopenssl.git

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

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>
---

diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index f7ecdec8c5..194d09b366 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -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;
 }