root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Clean up on failed BIO creation 

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16316)
This commit is contained in:
yuanjungong 2021-09-01 11:33:34 +08:00 committed by Tomas Mraz
parent 5001287c0d
commit f11c01a666
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openssl.c
View File

@ -168,14 +168,17 @@ static void setup_trace_category(int category)
{ {
BIO *channel; BIO *channel;
tracedata *trace_data; tracedata *trace_data;
BIO *bio = NULL;
if (OSSL_trace_enabled(category)) if (OSSL_trace_enabled(category))
return; return;
channel = BIO_push(BIO_new(BIO_f_prefix()), dup_bio_err(FORMAT_TEXT)); bio = BIO_new(BIO_f_prefix());
channel = BIO_push(bio, dup_bio_err(FORMAT_TEXT));
trace_data = OPENSSL_zalloc(sizeof(*trace_data)); trace_data = OPENSSL_zalloc(sizeof(*trace_data));
if (trace_data == NULL if (trace_data == NULL
|| bio == NULL
|| (trace_data->bio = channel) == NULL || (trace_data->bio = channel) == NULL
|| OSSL_trace_set_callback(category, internal_trace_cb, || OSSL_trace_set_callback(category, internal_trace_cb,
trace_data) == 0 trace_data) == 0

5
test/testutil/testutil_init.c
View File

@ -71,15 +71,18 @@ static void setup_trace_category(int category)
{ {
BIO *channel; BIO *channel;
tracedata *trace_data; tracedata *trace_data;
BIO *bio = NULL;
if (OSSL_trace_enabled(category)) if (OSSL_trace_enabled(category))
return; return;
channel = BIO_push(BIO_new(BIO_f_prefix()), bio = BIO_new(BIO_f_prefix());
channel = BIO_push(bio,
BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT)); BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT));
trace_data = OPENSSL_zalloc(sizeof(*trace_data)); trace_data = OPENSSL_zalloc(sizeof(*trace_data));
if (trace_data == NULL if (trace_data == NULL
|| bio == NULL
|| (trace_data->bio = channel) == NULL || (trace_data->bio = channel) == NULL
|| OSSL_trace_set_callback(category, internal_trace_cb, || OSSL_trace_set_callback(category, internal_trace_cb,
trace_data) == 0 trace_data) == 0