1 files changed, 31 insertions, 10 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 86cd9a289..dbb26068d 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -275,18 +275,21 @@ typedef struct tsplitter_s {
                    | TC_STRING | TC_NUMBER | TC_UOPPOST)
 #define TC_CONCAT2 (TC_OPERAND | TC_UOPPRE)
 
-#define OF_RES1    0x010000
-#define OF_RES2    0x020000
-#define OF_STR1    0x040000
-#define OF_STR2    0x080000
-#define OF_NUM1    0x100000
-#define OF_CHECKED 0x200000
+#define OF_RES1     0x010000
+#define OF_RES2     0x020000
+#define OF_STR1     0x040000
+#define OF_STR2     0x080000
+#define OF_NUM1     0x100000
+#define OF_CHECKED  0x200000
+#define OF_REQUIRED 0x400000
+
 
 /* combined operator flags */
 #define xx      0
 #define xV      OF_RES2
 #define xS      (OF_RES2 | OF_STR2)
 #define Vx      OF_RES1
+#define Rx      (OF_RES1 | OF_NUM1 | OF_REQUIRED)
 #define VV      (OF_RES1 | OF_RES2)
 #define Nx      (OF_RES1 | OF_NUM1)
 #define NV      (OF_RES1 | OF_NUM1 | OF_RES2)
@@ -425,7 +428,7 @@ static const uint32_t tokeninfo[] = {
         0,
         0, /* \n */
         ST_IF,        ST_DO,        ST_FOR,      OC_BREAK,
-        OC_CONTINUE,  OC_DELETE|Vx, OC_PRINT,
+        OC_CONTINUE,  OC_DELETE|Rx, OC_PRINT,
         OC_PRINTF,    OC_NEXT,      OC_NEXTFILE,
         OC_RETURN|Vx, OC_EXIT|Nx,
         ST_WHILE,
@@ -593,7 +596,7 @@ static const char EMSG_UNEXP_EOS[] ALIGN1 = "Unexpected end of string";
 static const char EMSG_UNEXP_TOKEN[] ALIGN1 = "Unexpected token";
 static const char EMSG_DIV_BY_ZERO[] ALIGN1 = "Division by zero";
 static const char EMSG_INV_FMT[] ALIGN1 = "Invalid format specifier";
-static const char EMSG_TOO_FEW_ARGS[] ALIGN1 = "Too few arguments for builtin";
+static const char EMSG_TOO_FEW_ARGS[] ALIGN1 = "Too few arguments";
 static const char EMSG_NOT_ARRAY[] ALIGN1 = "Not an array";
 static const char EMSG_POSSIBLE_ERROR[] ALIGN1 = "Possible syntax error";
 static const char EMSG_UNDEF_FUNC[] ALIGN1 = "Call to undefined function";
@@ -1269,7 +1272,7 @@ static node *parse_expr(uint32_t iexp)
         debug_printf_parse("%s(%x)\n", __func__, iexp);
 
         sn.info = PRIMASK;
-        sn.r.n = glptr = NULL;
+        sn.r.n = sn.a.n = glptr = NULL;
         xtc = TC_OPERAND | TC_UOPPRE | TC_REGEXP | iexp;
 
         while (!((tc = next_token(xtc)) & iexp)) {
@@ -1291,6 +1294,7 @@ static node *parse_expr(uint32_t iexp)
                             || ((t_info == vn->info) && ((t_info & OPCLSMASK) == OC_COLON))
                         ) {
                                 vn = vn->a.n;
+                                if (!vn->a.n) syntax_error(EMSG_UNEXP_TOKEN);
                         }
                         if ((t_info & OPCLSMASK) == OC_TERNARY)
                                 t_info += P(6);
@@ -1429,7 +1433,11 @@ static void chain_expr(uint32_t info)
         node *n;
 
         n = chain_node(info);
+
         n->l.n = parse_expr(TC_OPTERM | TC_GRPTERM);
+        if ((info & OF_REQUIRED) && !n->l.n)
+                syntax_error(EMSG_TOO_FEW_ARGS);
+
         if (t_tclass & TC_GRPTERM)
                 rollback_token();
 }
@@ -1609,12 +1617,25 @@ static void parse_program(char *p)
                         f = newfunc(t_string);
                         f->body.first = NULL;
                         f->nargs = 0;
-                        while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) {
+                        /* Match func arg list: a comma sep list of >= 0 args, and a close paren */
+                        while (next_token(TC_VARIABLE | TC_SEQTERM | TC_COMMA)) {
+                                /* Either an empty arg list, or trailing comma from prev iter
+                                 * must be followed by an arg */
+                                if (f->nargs == 0 && t_tclass == TC_SEQTERM)
+                                        break;
+
+                                /* TC_SEQSTART/TC_COMMA must be followed by TC_VARIABLE */
+                                if (t_tclass != TC_VARIABLE)
+                                        syntax_error(EMSG_UNEXP_TOKEN);
+
                                 v = findvar(ahash, t_string);
                                 v->x.aidx = f->nargs++;
 
+                                /* Arg followed either by end of arg list or 1 comma */
                                 if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM)
                                         break;
+                                if (t_tclass != TC_COMMA)
+                                        syntax_error(EMSG_UNEXP_TOKEN);
                         }
                         seq = &f->body;
                         chain_group();