From 8e184a24232ac494ffc7ec0d41b050fd39b7645d Mon Sep 17 00:00:00 2001 From: tedu <> Date: Tue, 18 Nov 2014 03:28:05 +0000 Subject: further BUF_strdup conversion: these places should be safe to rely on the function argument not being NULL --- src/lib/libcrypto/x509/x509_trs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/libcrypto/x509/x509_trs.c') 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; -- cgit v1.2.3-55-g6feb