A better fix for checking single-character expansions

FreeRADIUS · Jun 4, 2013 · 4571cd3 · 4571cd3
1 parent 1ea7374
commit 4571cd3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/xlat.c b/src/main/xlat.c
@@ -1010,7 +1010,9 @@ static ssize_t xlat_tokenize_literal(TALLOC_CTX *ctx, char *fmt, xlat_exp_t **he
 			char *c = p;
 
 			while (c) {
-				if (!c[1] || !strchr("%dlmtDGHISTY{", c[1])) {
+				if (c[1] == '{') break; /* this will be checked later */
+
+				if (!c[1] || !strchr("%dlmtDGHISTY", c[1])) {
 					talloc_free(node);
 					*error = "Invalid variable expansion";
 					c++;