diff options
author | tb <> | 2024-06-18 05:22:37 +0000 |
---|---|---|
committer | tb <> | 2024-06-18 05:22:37 +0000 |
commit | a8908122b0224f6a39077cb1b38ba6b2e4f6a0a1 (patch) | |
tree | 67b45540aef94aa2f0db88fc82de05d41c5f89b2 /src | |
parent | 0e4db269b0dc9d6214566ee52144d704388535f4 (diff) | |
download | openbsd-a8908122b0224f6a39077cb1b38ba6b2e4f6a0a1.tar.gz openbsd-a8908122b0224f6a39077cb1b38ba6b2e4f6a0a1.tar.bz2 openbsd-a8908122b0224f6a39077cb1b38ba6b2e4f6a0a1.zip |
do_ext_i2d(): make various NULL checks explicit
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/x509/x509_conf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c index 30cf0b981c..a491bb7c2b 100644 --- a/src/lib/libcrypto/x509/x509_conf.c +++ b/src/lib/libcrypto/x509/x509_conf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_conf.c,v 1.6 2024/06/18 05:19:01 tb Exp $ */ | 1 | /* $OpenBSD: x509_conf.c,v 1.7 2024/06/18 05:22:37 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -194,7 +194,7 @@ do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid, int crit, | |||
194 | X509_EXTENSION *ext; | 194 | X509_EXTENSION *ext; |
195 | 195 | ||
196 | /* Convert internal representation to DER */ | 196 | /* Convert internal representation to DER */ |
197 | if (method->it) { | 197 | if (method->it != NULL) { |
198 | ext_der = NULL; | 198 | ext_der = NULL; |
199 | ext_len = ASN1_item_i2d(ext_struc, &ext_der, method->it); | 199 | ext_len = ASN1_item_i2d(ext_struc, &ext_der, method->it); |
200 | if (ext_len < 0) | 200 | if (ext_len < 0) |
@@ -202,18 +202,18 @@ do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid, int crit, | |||
202 | } else { | 202 | } else { |
203 | unsigned char *p; | 203 | unsigned char *p; |
204 | ext_len = method->i2d(ext_struc, NULL); | 204 | ext_len = method->i2d(ext_struc, NULL); |
205 | if (!(ext_der = malloc(ext_len))) | 205 | if ((ext_der = malloc(ext_len)) == NULL) |
206 | goto merr; | 206 | goto merr; |
207 | p = ext_der; | 207 | p = ext_der; |
208 | method->i2d(ext_struc, &p); | 208 | method->i2d(ext_struc, &p); |
209 | } | 209 | } |
210 | if (!(ext_oct = ASN1_OCTET_STRING_new())) | 210 | if ((ext_oct = ASN1_OCTET_STRING_new()) == NULL) |
211 | goto merr; | 211 | goto merr; |
212 | ext_oct->data = ext_der; | 212 | ext_oct->data = ext_der; |
213 | ext_oct->length = ext_len; | 213 | ext_oct->length = ext_len; |
214 | 214 | ||
215 | ext = X509_EXTENSION_create_by_NID(NULL, ext_nid, crit, ext_oct); | 215 | ext = X509_EXTENSION_create_by_NID(NULL, ext_nid, crit, ext_oct); |
216 | if (!ext) | 216 | if (ext == NULL) |
217 | goto merr; | 217 | goto merr; |
218 | ASN1_OCTET_STRING_free(ext_oct); | 218 | ASN1_OCTET_STRING_free(ext_oct); |
219 | 219 | ||