Fix potential NULL dereference for function with NULL argument list

FreeRADIUS · Sep 26, 2018 · 2a53d2f · 2a53d2f
1 parent 1be13aa
commit 2a53d2f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/lib/server/xlat_eval.c b/src/lib/server/xlat_eval.c
@@ -1012,7 +1012,7 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_cursor_t *out, xlat_exp_t cons
 			 *	call the function directly.
 			 */
 			xa = xlat_frame_eval_repeat(ctx, out, child, NULL, request, in, &result);
-			if (xa != XLAT_ACTION_DONE) goto finish;
+			if (xa != XLAT_ACTION_DONE || (!*in)) goto finish;
 		}
 			continue;
 

diff --git a/src/tests/keywords/xlat-alternation-fail-then-func b/src/tests/keywords/xlat-alternation-fail-then-func
@@ -0,0 +1,16 @@
+#
+# PRE: update
+#
+
+#
+#  Everything null
+#
+update request {
+	Tmp-String-0 !* ANY
+	Tmp-String-1 !* ANY
+}
+update request {
+	Tmp-String-2 := "%{%{Tmp-String-0[0]}:-%{Tmp-String-1[0]}}%{delay_10s:}"
+}
+
+success