diff options
| author | jsing <> | 2018-02-07 05:49:36 +0000 |
|---|---|---|
| committer | jsing <> | 2018-02-07 05:49:36 +0000 |
| commit | 1d38b78d8364c43408f3ba4af999c875f43f0ea0 (patch) | |
| tree | 930a6168ef1fc4d4b7f8dbee4ed98f178507d581 /src | |
| parent | 8b26a12dbe124fea0169712974ac2d8468e92dd9 (diff) | |
| download | openbsd-1d38b78d8364c43408f3ba4af999c875f43f0ea0.tar.gz openbsd-1d38b78d8364c43408f3ba4af999c875f43f0ea0.tar.bz2 openbsd-1d38b78d8364c43408f3ba4af999c875f43f0ea0.zip | |
Nuke some more free NULL guards.
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/ocsp.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/usr.bin/openssl/ocsp.c b/src/usr.bin/openssl/ocsp.c index 60a53f0ca5..04a719bf40 100644 --- a/src/usr.bin/openssl/ocsp.c +++ b/src/usr.bin/openssl/ocsp.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ocsp.c,v 1.14 2018/02/07 05:47:55 jsing Exp $ */ | 1 | /* $OpenBSD: ocsp.c,v 1.15 2018/02/07 05:49:36 jsing 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 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -926,8 +926,7 @@ make_ocsp_response(OCSP_RESPONSE ** resp, OCSP_REQUEST * req, CA_DB * db, | |||
| 926 | NULL); | 926 | NULL); |
| 927 | goto end; | 927 | goto end; |
| 928 | } | 928 | } |
| 929 | if (ca_id) | 929 | OCSP_CERTID_free(ca_id); |
| 930 | OCSP_CERTID_free(ca_id); | ||
| 931 | ca_id = OCSP_cert_to_id(cert_id_md, NULL, ca); | 930 | ca_id = OCSP_cert_to_id(cert_id_md, NULL, ca); |
| 932 | 931 | ||
| 933 | /* Is this request about our CA? */ | 932 | /* Is this request about our CA? */ |
| @@ -1174,8 +1173,7 @@ query_responder(BIO * err, BIO * cbio, char *path, | |||
| 1174 | } | 1173 | } |
| 1175 | } | 1174 | } |
| 1176 | err: | 1175 | err: |
| 1177 | if (ctx) | 1176 | OCSP_REQ_CTX_free(ctx); |
| 1178 | OCSP_REQ_CTX_free(ctx); | ||
| 1179 | 1177 | ||
| 1180 | return rsp; | 1178 | return rsp; |
| 1181 | } | 1179 | } |
| @@ -1211,10 +1209,8 @@ process_responder(BIO * err, OCSP_REQUEST * req, | |||
| 1211 | if (!resp) | 1209 | if (!resp) |
| 1212 | BIO_printf(bio_err, "Error querying OCSP responder\n"); | 1210 | BIO_printf(bio_err, "Error querying OCSP responder\n"); |
| 1213 | end: | 1211 | end: |
| 1214 | if (cbio) | 1212 | BIO_free_all(cbio); |
| 1215 | BIO_free_all(cbio); | 1213 | SSL_CTX_free(ctx); |
| 1216 | if (ctx) | ||
| 1217 | SSL_CTX_free(ctx); | ||
| 1218 | return resp; | 1214 | return resp; |
| 1219 | } | 1215 | } |
| 1220 | 1216 | ||