From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 17 Nov 2022 14:34:37 +0000 (-0500)
Subject: more corner cases, as caught by ASAN
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67a770904530d16b4dfe6a3479668d9e1381b18d;p=thirdparty%2Ffreeradius-server.git

more corner cases, as caught by ASAN
---

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index d77bb924138..e83dca5acf3 100644
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -1434,7 +1434,11 @@ static unlang_t *compile_update_to_edit(unlang_t *parent, unlang_compile_t *unla
 			 *	@todo - add support for &config?
 			 */
 			if (fr_table_value_by_substr(pair_list_table, p, q - p, PAIR_LIST_UNKNOWN) != PAIR_LIST_UNKNOWN) {
-				p = q + 1;
+				if (*q) {
+					p = q + 1;
+				} else {
+					p = NULL;
+				}
 			}
 
 			/*
@@ -1449,14 +1453,20 @@ static unlang_t *compile_update_to_edit(unlang_t *parent, unlang_compile_t *unla
 				if (*p) {
 					snprintf(lhs, sizeof(lhs), "&%s", p);
 					attr = lhs;
+
 				} else {
 					attr = NULL;
 				}
-			} else {
+
+			} else if (p) {
 				/*
 				 *	There is no list reference, so print out the default one.
 				 */
 				snprintf(list, sizeof(list), "&%s", fr_table_str_by_value(pair_list_table, unlang_ctx->rules->attr.list_def, "???"));
+
+			} else {
+				strlcpy(list, attr, sizeof(list));
+				attr = NULL;
 			}
 		}