further BUF_strdup conversion: these places should be safe to rely on

the function argument not being NULL

6 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libcrypto/store/str_lib.c b/src/lib/libcrypto/store/str_lib.c
index 9ae93b6405..2ea3ad958a 100644
--- a/src/lib/libcrypto/store/str_lib.c
+++ b/src/lib/libcrypto/store/str_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str_lib.c,v 1.11 2014/10/16 03:19:02 beck Exp $ */
+/* $OpenBSD: str_lib.c,v 1.12 2014/11/18 03:28:05 tedu Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2003.
  */
@@ -1341,7 +1341,7 @@ STORE_ATTR_INFO_set_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
                 return 0;
         }
         if (!ATTR_IS_SET(attrs, code)) {
-                if (cstr && (attrs->values[code].cstring = strndup(cstr, cstr_size)))
+                if ((attrs->values[code].cstring = strndup(cstr, cstr_size)))
                         return 1;
                 STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR,
                     ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index d4e6be65e6..95fb568c68 100644
--- a/src/lib/libcrypto/x509/x509_trs.c
+++ b/src/lib/libcrypto/x509/x509_trs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_trs.c,v 1.17 2014/10/16 03:19:02 beck Exp $ */
+/* $OpenBSD: x509_trs.c,v 1.18 2014/11/18 03:28:05 tedu Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -203,7 +203,7 @@ X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
         if (trtmp->flags & X509_TRUST_DYNAMIC_NAME)
                 free(trtmp->name);
         /* dup supplied name */
-        if (name == NULL || (trtmp->name = strdup(name)) == NULL)
+        if ((trtmp->name = strdup(name)) == NULL)
                 goto err;
         /* Keep the dynamic flag of existing entry */
         trtmp->flags &= X509_TRUST_DYNAMIC;
diff --git a/src/lib/libcrypto/x509v3/v3_addr.c b/src/lib/libcrypto/x509v3/v3_addr.c
index 1e016586c7..40efb1b9ac 100644
--- a/src/lib/libcrypto/x509v3/v3_addr.c
+++ b/src/lib/libcrypto/x509v3/v3_addr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_addr.c,v 1.13 2014/07/13 16:03:10 beck Exp $ */
+/* $OpenBSD: v3_addr.c,v 1.14 2014/11/18 03:28:05 tedu Exp $ */
 /*
  * Contributed to the OpenSSL Project by the American Registry for
  * Internet Numbers ("ARIN").
@@ -1019,7 +1019,7 @@ v2i_IPAddrBlocks(const struct v3_ext_method *method, struct v3_ext_ctx *ctx,
                 length = length_from_afi(afi);
 
                 /*
-                 * Handle SAFI, if any, and BUF_strdup() so we can null-terminate
+                 * Handle SAFI, if any, and strdup() so we can null-terminate
                  * the other input values.
                  */
                 if (safi != NULL) {
diff --git a/src/lib/libssl/src/crypto/store/str_lib.c b/src/lib/libssl/src/crypto/store/str_lib.c
index 9ae93b6405..2ea3ad958a 100644
--- a/src/lib/libssl/src/crypto/store/str_lib.c
+++ b/src/lib/libssl/src/crypto/store/str_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str_lib.c,v 1.11 2014/10/16 03:19:02 beck Exp $ */
+/* $OpenBSD: str_lib.c,v 1.12 2014/11/18 03:28:05 tedu Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2003.
  */
@@ -1341,7 +1341,7 @@ STORE_ATTR_INFO_set_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
                 return 0;
         }
         if (!ATTR_IS_SET(attrs, code)) {
-                if (cstr && (attrs->values[code].cstring = strndup(cstr, cstr_size)))
+                if ((attrs->values[code].cstring = strndup(cstr, cstr_size)))
                         return 1;
                 STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR,
                     ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libssl/src/crypto/x509/x509_trs.c b/src/lib/libssl/src/crypto/x509/x509_trs.c
index d4e6be65e6..95fb568c68 100644
--- a/src/lib/libssl/src/crypto/x509/x509_trs.c
+++ b/src/lib/libssl/src/crypto/x509/x509_trs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_trs.c,v 1.17 2014/10/16 03:19:02 beck Exp $ */
+/* $OpenBSD: x509_trs.c,v 1.18 2014/11/18 03:28:05 tedu Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -203,7 +203,7 @@ X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
         if (trtmp->flags & X509_TRUST_DYNAMIC_NAME)
                 free(trtmp->name);
         /* dup supplied name */
-        if (name == NULL || (trtmp->name = strdup(name)) == NULL)
+        if ((trtmp->name = strdup(name)) == NULL)
                 goto err;
         /* Keep the dynamic flag of existing entry */
         trtmp->flags &= X509_TRUST_DYNAMIC;
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_addr.c b/src/lib/libssl/src/crypto/x509v3/v3_addr.c
index 1e016586c7..40efb1b9ac 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_addr.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_addr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_addr.c,v 1.13 2014/07/13 16:03:10 beck Exp $ */
+/* $OpenBSD: v3_addr.c,v 1.14 2014/11/18 03:28:05 tedu Exp $ */
 /*
  * Contributed to the OpenSSL Project by the American Registry for
  * Internet Numbers ("ARIN").
@@ -1019,7 +1019,7 @@ v2i_IPAddrBlocks(const struct v3_ext_method *method, struct v3_ext_ctx *ctx,
                 length = length_from_afi(afi);
 
                 /*
-                 * Handle SAFI, if any, and BUF_strdup() so we can null-terminate
+                 * Handle SAFI, if any, and strdup() so we can null-terminate
                  * the other input values.
                  */
                 if (safi != NULL) {