Commit 941d9fb6 authored by Todd Short's avatar Todd Short Committed by Rich Salz
Browse files

OCSP_request_add0_id() inconsistent error return 



There are two failure cases for OCSP_request_add_id():
1. OCSP_ONEREQ_new() failure, where |cid| is not freed
2. sk_OCSP_ONEREQ_push() failure, where |cid| is freed

This changes makes the error behavior consistent, such that |cid| is
not freed when sk_OCSP_ONEREQ_push() fails. OpenSSL only takes
ownership of |cid| when the function succeeds.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1289)
(cherry picked from commit 415e7c48)
parent b5c835b3

crypto/ocsp/ocsp_cl.c

+3 −1
Original line number Diff line number Diff line
@@ -93,8 +93,10 @@ OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid) 
    if (one->reqCert)

        OCSP_CERTID_free(one->reqCert);

    one->reqCert = cid;

    if (req && !sk_OCSP_ONEREQ_push(req->tbsRequest->requestList, one))

    if (req && !sk_OCSP_ONEREQ_push(req->tbsRequest->requestList, one)) {

        one->reqCert = NULL; /* do not free on error */

        goto err;

    }

    return one;

 err:

    OCSP_ONEREQ_free(one);