From: tb <tb@openbsd.org>
Date: Sat, 11 Mar 2023 16:02:06 +0000 (+0000)
Subject: Tiny cleanup for readability
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=23db8409f3f55d2974446693424a5184bebb186a;p=openbsd

Tiny cleanup for readability

Turn a malloc() into calloc() and check two function calls directly
forever instead of a combined check afterward.
---

diff --git a/lib/libcrypto/asn1/bio_ndef.c b/lib/libcrypto/asn1/bio_ndef.c
index 33dfe73fc95..3fd7f3c4c36 100644
--- a/lib/libcrypto/asn1/bio_ndef.c
+++ b/lib/libcrypto/asn1/bio_ndef.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_ndef.c,v 1.14 2023/03/11 15:56:03 tb Exp $ */
+/* $OpenBSD: bio_ndef.c,v 1.15 2023/03/11 16:02:06 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -109,10 +109,11 @@ BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it)
 		ASN1error(ASN1_R_STREAMING_NOT_SUPPORTED);
 		return NULL;
 	}
-	ndef_aux = malloc(sizeof(NDEF_SUPPORT));
-	asn_bio = BIO_new(BIO_f_asn1());
 
-	if (ndef_aux == NULL || asn_bio == NULL)
+	if ((ndef_aux = calloc(1, sizeof(NDEF_SUPPORT))) == NULL)
+		goto err;
+
+	if ((asn_bio = BIO_new(BIO_f_asn1())) == NULL)
 		goto err;
 
 	if ((out = BIO_push(asn_bio, out)) == NULL)