From: mildis <me@mildis.org>
Date: Tue, 2 Oct 2018 14:46:34 +0000 (+0200)
Subject: BUG/MINOR: checks: queues null-deref
X-Git-Tag: v1.9-dev4~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ab01cb01114065a3573570a48e84815e751bf14;p=thirdparty%2Fhaproxy.git

BUG/MINOR: checks: queues null-deref

queues can be null if calloc() failed.
Bypass free* calls when calloc did fail.
---

diff --git a/src/checks.c b/src/checks.c
index 52c762b55a..5772c4f28d 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -3235,7 +3235,7 @@ int init_email_alert(struct mailers *mls, struct proxy *p, char **err)
 
 	if ((queues = calloc(mls->count, sizeof(*queues))) == NULL) {
 		memprintf(err, "out of memory while allocating mailer alerts queues");
-		goto error;
+		goto fail_no_queue;
 	}
 
 	for (mailer = mls->mailer_list; mailer; i++, mailer = mailer->next) {
@@ -3292,6 +3292,7 @@ int init_email_alert(struct mailers *mls, struct proxy *p, char **err)
 		free_check(check);
 	}
 	free(queues);
+  fail_no_queue:
 	return 1;
 }