diff options
author | marha <marha@users.sourceforge.net> | 2014-09-02 18:24:12 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:26:00 +0200 |
commit | 04168ae281bfbd714ddf6b90d98eac892508dde8 (patch) | |
tree | c2d7e42dede9c0b9930ce537eb7d804e45459e53 /openssl/crypto/ocsp/ocsp_ht.c | |
parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
download | vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.gz vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.bz2 vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.zip |
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/crypto/ocsp/ocsp_ht.c')
-rw-r--r-- | openssl/crypto/ocsp/ocsp_ht.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/openssl/crypto/ocsp/ocsp_ht.c b/openssl/crypto/ocsp/ocsp_ht.c index af5fc1669..09eb855d4 100644 --- a/openssl/crypto/ocsp/ocsp_ht.c +++ b/openssl/crypto/ocsp/ocsp_ht.c @@ -158,6 +158,8 @@ OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req, OCSP_REQ_CTX *rctx; rctx = OPENSSL_malloc(sizeof(OCSP_REQ_CTX)); + if (!rctx) + return NULL; rctx->state = OHS_ERROR; rctx->mem = BIO_new(BIO_s_mem()); rctx->io = io; @@ -167,18 +169,21 @@ OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req, else rctx->iobuflen = OCSP_MAX_LINE_LEN; rctx->iobuf = OPENSSL_malloc(rctx->iobuflen); - if (!rctx->iobuf) - return 0; + if (!rctx->mem || !rctx->iobuf) + goto err; if (!path) path = "/"; if (BIO_printf(rctx->mem, post_hdr, path) <= 0) - return 0; + goto err; if (req && !OCSP_REQ_CTX_set1_req(rctx, req)) - return 0; + goto err; return rctx; + err: + OCSP_REQ_CTX_free(rctx); + return NULL; } /* Parse the HTTP response. This will look like this: @@ -490,6 +495,9 @@ OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req) ctx = OCSP_sendreq_new(b, path, req, -1); + if (!ctx) + return NULL; + do { rv = OCSP_sendreq_nbio(&resp, ctx); |