diff options
| author | Phil Sutter <phil@nwl.cc> | 2023-09-13 22:07:46 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2023-09-22 10:55:25 +0200 |
| commit | 7df0b2f1a1c64e2bdc652fd2418b4f7218c93f1f (patch) | |
| tree | b2e0e07849f1bfbf1253235dfc34a773fdb71d51 /src/parser_json.c | |
| parent | 1e5ad2eeb38af0af2e06d4cba0ec4d84009855fa (diff) | |
parser_json: Catch nonsense ops in match statement
Since expr_op_symbols array includes binary operators and more, simply
checking the given string matches any of the elements is not sufficient.
Fixes: 586ad210368b7 ("libnftables: Implement JSON parser")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'src/parser_json.c')
| -rw-r--r-- | src/parser_json.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/parser_json.c b/src/parser_json.c index eec73034..c4a09797 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -1725,13 +1725,18 @@ static struct stmt *json_parse_match_stmt(struct json_ctx *ctx, !strcmp(opstr, expr_op_symbols[op])) break; } - if (op == __OP_MAX) { + switch (op) { + case OP_EQ ... OP_NEG: + break; + case __OP_MAX: if (!strcmp(opstr, "in")) { op = OP_IMPLICIT; - } else { - json_error(ctx, "Unknown relational op '%s'.", opstr); - return NULL; + break; } + /* fall through */ + default: + json_error(ctx, "Invalid relational op '%s'.", opstr); + return NULL; } left = json_parse_expr(ctx, jleft); |