From ba7c6bac5d2c870a4d1c1ce9f08db5e57c660625 Mon Sep 17 00:00:00 2001 From: miod <> Date: Sat, 5 Nov 2016 15:21:20 +0000 Subject: Check BIO_new*() for failure. ok beck@ jsing@ --- src/lib/libcrypto/ocsp/ocsp_ht.c | 7 +++++-- src/lib/libcrypto/x509v3/pcy_tree.c | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c index 4d21543396..61af3717b7 100644 --- a/src/lib/libcrypto/ocsp/ocsp_ht.c +++ b/src/lib/libcrypto/ocsp/ocsp_ht.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_ht.c,v 1.22 2014/10/03 06:02:38 doug Exp $ */ +/* $OpenBSD: ocsp_ht.c,v 1.23 2016/11/05 15:21:20 miod Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -157,7 +157,10 @@ OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req, int maxline) if (rctx == NULL) return NULL; rctx->state = OHS_ERROR; - rctx->mem = BIO_new(BIO_s_mem()); + if ((rctx->mem = BIO_new(BIO_s_mem())) == NULL) { + free(rctx); + return NULL; + } rctx->io = io; rctx->asn1_len = 0; if (maxline > 0) diff --git a/src/lib/libcrypto/x509v3/pcy_tree.c b/src/lib/libcrypto/x509v3/pcy_tree.c index 7b28acbe1f..a56c183bc9 100644 --- a/src/lib/libcrypto/x509v3/pcy_tree.c +++ b/src/lib/libcrypto/x509v3/pcy_tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcy_tree.c,v 1.16 2016/03/11 07:08:45 mmcc Exp $ */ +/* $OpenBSD: pcy_tree.c,v 1.17 2016/11/05 15:21:20 miod Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2004. */ @@ -99,7 +99,9 @@ tree_print(char *str, X509_POLICY_TREE *tree, X509_POLICY_LEVEL *curr) int i; BIO *err; - err = BIO_new_fp(stderr, BIO_NOCLOSE); + if ((err = BIO_new_fp(stderr, BIO_NOCLOSE)) == NULL) + return; + if (!curr) curr = tree->levels + tree->nlevel; else -- cgit v1.2.3-55-g6feb