Browse Source

Remove some unnecessary NULL checks.

OPENSSL_free will handle NULL.

Change-Id: I18593a015cd4a081c2eeebf0cd738a024d02a97d
Reviewed-on: https://boringssl-review.googlesource.com/14373
Reviewed-by: Steven Valdez <svaldez@chromium.org>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
kris/onging/CECPQ3_patch15
David Benjamin 7 years ago
committed by CQ bot account: commit-bot@chromium.org
parent
commit
94cf5d030f
1 changed files with 4 additions and 11 deletions
  1. +4
    -11
      crypto/x509/pkcs7.c

+ 4
- 11
crypto/x509/pkcs7.c View File

@@ -90,11 +90,8 @@ static int pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs) {
return 1; return 1;


err: err:
if (*der_bytes) {
OPENSSL_free(*der_bytes);
*der_bytes = NULL;
}

OPENSSL_free(*der_bytes);
*der_bytes = NULL;
return 0; return 0;
} }


@@ -144,9 +141,7 @@ int PKCS7_get_certificates(STACK_OF(X509) *out_certs, CBS *cbs) {
ret = 1; ret = 1;


err: err:
if (der_bytes) {
OPENSSL_free(der_bytes);
}
OPENSSL_free(der_bytes);


if (!ret) { if (!ret) {
while (sk_X509_num(out_certs) != initial_certs_len) { while (sk_X509_num(out_certs) != initial_certs_len) {
@@ -214,9 +209,7 @@ int PKCS7_get_CRLs(STACK_OF(X509_CRL) *out_crls, CBS *cbs) {
ret = 1; ret = 1;


err: err:
if (der_bytes) {
OPENSSL_free(der_bytes);
}
OPENSSL_free(der_bytes);


if (!ret) { if (!ret) {
while (sk_X509_CRL_num(out_crls) != initial_crls_len) { while (sk_X509_CRL_num(out_crls) != initial_crls_len) {


Loading…
Cancel
Save