Changes to m4/m4/macro.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/08/21 02:37:45

Index: m4/macro.c
===================================================================
RCS file: /sources/m4/m4/m4/macro.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- m4/macro.c  16 Aug 2006 12:23:05 -0000      1.48
+++ m4/macro.c  21 Aug 2006 02:37:45 -0000      1.49
@@ -254,8 +254,6 @@
     trace_pre (context, name, my_call_id, argc, argv);
 
   expansion = m4_push_string_init (context);
-  if (!m4_bad_argc (context, argc, argv,
-                   SYMBOL_MIN_ARGS (symbol), SYMBOL_MAX_ARGS (symbol)))
     m4_macro_call (context, symbol, expansion, argc, argv);
   expanded = m4_push_string_finish ();
 
@@ -319,6 +317,9 @@
 m4_macro_call (m4 *context, m4_symbol *symbol, m4_obstack *expansion,
               int argc, m4_symbol_value **argv)
 {
+  if (m4_bad_argc (context, argc, argv,
+                  SYMBOL_MIN_ARGS (symbol), SYMBOL_MAX_ARGS (symbol)))
+    return;
   if (m4_is_symbol_text (symbol))
     {
       process_macro (context, symbol, expansion, argc, argv);