From: Christopher Faulet <cfaulet@haproxy.com>
Date: Sun, 2 Dec 2018 08:37:38 +0000 (+0100)
Subject: BUG/MINOR: cfgparse: Fix the call to post parser of the last sections parsed
X-Git-Tag: v1.9-dev9~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf7a9597e2e27f999562043eca6b95763d166130;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cfgparse: Fix the call to post parser of the last sections parsed

Wrong variable was used to know if we need to call the callback
post_section_parser() or not. We must use 'cs' and not 'pcs'.

This patch must be backported in 1.8 with the commit 7805e2b ("BUG/MINOR:
cfgparse: Fix transition between 2 sections with the same name").
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index a28d24cce9..d754dd55e0 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1890,8 +1890,8 @@ next_line:
 			err_code |= pcs->post_section_parser();
 			if (err_code & ERR_ABORT)
 				goto err;
-			pcs = NULL;
 		}
+		pcs = NULL;
 
 		if (!cs) {
 			ha_alert("parsing [%s:%d]: unknown keyword '%s' out of section.\n", file, linenum, args[0]);
@@ -1903,7 +1903,7 @@ next_line:
 		}
 	}
 
-	if (cs && pcs->post_section_parser)
+	if (cs && cs->post_section_parser)
 		err_code |= cs->post_section_parser();
 
 err: