diff options
| author | Matt Caswell <matt@openssl.org> | 2015-10-30 12:12:26 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-09 23:48:41 +0100 |
| commit | 90945fa31a42dcf3beb90540c618e4d627c595ea (patch) | |
| tree | e73870c253abf0c37ca618384e30a7937a996b55 /crypto/ocsp/v3_ocsp.c | |
| parent | Standardise our style for checking malloc failures (diff) | |
| download | openssl-90945fa31a42dcf3beb90540c618e4d627c595ea.tar.xz openssl-90945fa31a42dcf3beb90540c618e4d627c595ea.zip | |
Continue standardising malloc style for libcrypto
Continuing from previous commit ensure our style is consistent for malloc
return checks.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'crypto/ocsp/v3_ocsp.c')
| -rw-r--r-- | crypto/ocsp/v3_ocsp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c index ab8c4376b1..9a49422df7 100644 --- a/crypto/ocsp/v3_ocsp.c +++ b/crypto/ocsp/v3_ocsp.c @@ -234,10 +234,13 @@ static void *d2i_ocsp_nonce(void *a, const unsigned char **pp, long length) { ASN1_OCTET_STRING *os, **pos; pos = a; - if (!pos || !*pos) + if (pos == NULL || *pos == NULL) { os = ASN1_OCTET_STRING_new(); - else + if (os == NULL) + goto err; + } else { os = *pos; + } if (!ASN1_OCTET_STRING_set(os, *pp, length)) goto err; |