From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 25 Jan 2018 10:36:35 +0000 (+0100)
Subject: BUG/MEDIUM: checks: Don't try to release undefined conn_stream when a check is freed
X-Git-Tag: v1.9-dev1~496
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d86d157edd6da8d3fe40d7883a3d2beeed3189;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: checks: Don't try to release undefined conn_stream when a check is freed

When a healt-check is released, the attached conn_stream may be undefined. For
instance, this happens when 'no-check' option is used on a server line. So we
must check it is defined before trying to release it.

This patch must be backported in 1.8.
---

diff --git a/src/checks.c b/src/checks.c
index 56c9d609d1..0d4893e693 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -3098,10 +3098,12 @@ void free_check(struct check *check)
 	check->bi = NULL;
 	free(check->bo);
 	check->bo = NULL;
-	free(check->cs->conn);
-	check->cs->conn = NULL;
-	cs_free(check->cs);
-	check->cs = NULL;
+	if (check->cs) {
+		free(check->cs->conn);
+		check->cs->conn = NULL;
+		cs_free(check->cs);
+		check->cs = NULL;
+	}
 }
 
 void email_alert_free(struct email_alert *alert)