Raise an error when passing arguments to non-parametric macros

Fixes: rpm-software-management#2932
pmatilai · Feb 28, 2024 · 010f090 · 010f090
1 parent ebece0f
commit 010f090
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/rpmio/macro.c b/rpmio/macro.c
@@ -1722,6 +1722,11 @@ expandMacro(rpmMacroBuf mb, const char *src, size_t slen)
 	if (me->opts == NULL && !(me->flags & ME_FUNC)) {
 	    /* Simple non-parametric macro */
 	    doMacro(mb, me, NULL, NULL);
+	    if (g) {
+		rpmMacroBufErr(mb, 1,
+			_("unexpected argument to non-parametric macro %%%s\n"),
+			me->name);
+	    }
 	    s = se;
 	    continue;
 	}

diff --git a/tests/rpmmacro.at b/tests/rpmmacro.at
@@ -426,6 +426,20 @@ runroot rpm \
 0
 0
 ])
+
+RPMTEST_CHECK([
+runroot rpm \
+    --define 'zzz xxx' \
+    --eval '%zzz' \
+    --eval '%{zzz}' \
+    --eval '%{zzz:}' \
+],
+[1],
+[xxx
+xxx
+],
+[error: unexpected argument to non-parametric macro %zzz
+])
 RPMTEST_CLEANUP
 
 AT_SETUP([string functions])