From: Dragan Dosen <ddosen@haproxy.com>
Date: Fri, 4 May 2018 14:27:15 +0000 (+0200)
Subject: BUG/MINOR: map: correctly track reference to the last ref_elt being dumped
X-Git-Tag: v1.9-dev1~271
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=336a11f75571ad46f74a7c6247c13ed44f95da93;p=thirdparty%2Fhaproxy.git

BUG/MINOR: map: correctly track reference to the last ref_elt being dumped

The bug was introduced in the commit 8d85aa4 ("BUG/MAJOR: map: fix
segfault during 'show map/acl' on cli").

This patch should be backported to 1.8, 1.7 and 1.6.
---

diff --git a/src/map.c b/src/map.c
index ad47c7f233..0f1b754760 100644
--- a/src/map.c
+++ b/src/map.c
@@ -307,9 +307,9 @@ static int cli_io_handler_pat_list(struct appctx *appctx)
 		 * reference to the last ref_elt being dumped.
 		 */
 		if (appctx->st2 == STAT_ST_LIST) {
-			if (!LIST_ISEMPTY(&appctx->ctx.sess.bref.users)) {
-				LIST_DEL(&appctx->ctx.sess.bref.users);
-				LIST_INIT(&appctx->ctx.sess.bref.users);
+			if (!LIST_ISEMPTY(&appctx->ctx.map.bref.users)) {
+				LIST_DEL(&appctx->ctx.map.bref.users);
+				LIST_INIT(&appctx->ctx.map.bref.users);
 			}
 		}
 		return 1;