From: William Lallemand <wlallemand@haproxy.com>
Date: Fri, 20 Mar 2020 13:42:36 +0000 (+0100)
Subject: BUG/MINOR: ssl/cli: fix a potential NULL dereference
X-Git-Tag: v2.2-dev5~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18eeb8e8156c4f32a65cee40a96b0b30e74eeb59;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl/cli: fix a potential NULL dereference

Fix a potential NULL dereference in "show ssl cert" when we can't
allocate the <out> trash buffer.

This patch creates a new label so we could jump without trying to do the
ci_putchk in this case.

This bug was introduced by ea987ed ("MINOR: ssl/cli: 'new ssl cert'
command"). 2.2 only.

This bug was referenced by issue #556.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index bf571dd8a1..9b44e9d0b9 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -11249,7 +11249,7 @@ static int cli_io_handler_show_cert_detail(struct appctx *appctx)
 	int i;
 
 	if (!tmp || !out)
-		goto end;
+		goto end_no_putchk;
 
 	if (!ckchs->multi) {
 		chunk_appendf(out, "Filename: ");
@@ -11374,6 +11374,7 @@ end:
 		goto yield;
 	}
 
+end_no_putchk:
 	if (bio)
 		BIO_free(bio);
 	free_trash_chunk(tmp);