From: James Jones <jejones3141@gmail.com>
Date: Fri, 29 Apr 2022 19:15:36 +0000 (-0500)
Subject: remove needless check of parent in parse_input() (CID #1469153 (#4480)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faba86739353bae91bddc9ca20b3a773c5eb1bc2;p=thirdparty%2Ffreeradius-server.git

remove needless check of parent in parse_input() (CID #1469153 (#4480)

Earlier in the code, parent->allow_unlang is tested; if parent
is NULL, it will break thre, so the later check is unnecessary.
---

diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index 3d5612faba0..de45ccb5439 100644
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -1674,6 +1674,8 @@ static int parse_input(cf_stack_t *stack)
 	buff[2] = stack->buff[2];
 	buff[3] = stack->buff[3];
 
+	fr_assert(parent != NULL);
+
 	/*
 	 *	Catch end of a subsection.
 	 */
@@ -1888,7 +1890,7 @@ static int parse_input(cf_stack_t *stack)
 		/*
 		 *	As a hack, allow any operators when using &foo=bar
 		 */
-		if ((!parent || !frame->special) && (buff[1][0] != '&')) {
+		if (!frame->special && (buff[1][0] != '&')) {
 			ERROR("%s[%d]: Invalid operator in assignment for %s ...",
 			      frame->filename, frame->lineno, buff[1]);
 			return -1;