parser_json: fix several expression memleaks from error path

commit bae7b4d283826efbeb28c21aecd7b355e86da170 upstream.

Fixes: 586ad210368b ("libnftables: Implement JSON parser")
Signed-off-by: Sebastian Walz (sivizius) <sebastian.walz@secunet.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/parser_json.c b/src/parser_json.c
index de36c3ad541449b32b8f4e2d26f2a2dca3a09e61..9c12863e2af1b4d8d941b1ed16c8a912527051b3 100644 (file)
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -1237,6 +1237,7 @@ static struct expr *json_parse_range_expr(struct json_ctx *ctx,
        expr_high = json_parse_primary_expr(ctx, high);
        if (!expr_high) {
                json_error(ctx, "Invalid high value in range expression.");
+               expr_free(expr_low);
                return NULL;
        }
        return range_expr_alloc(int_loc, expr_low, expr_high);
@@ -1796,6 +1797,8 @@ static struct stmt *json_parse_mangle_stmt(struct json_ctx *ctx,
                return stmt;
        default:
                json_error(ctx, "Invalid mangle statement key expression type.");
+               expr_free(key);
+               expr_free(value);
                return NULL;
        }
 }
@@ -2798,6 +2801,7 @@ static struct stmt *json_parse_optstrip_stmt(struct json_ctx *ctx,
            expr->etype != EXPR_EXTHDR ||
            expr->exthdr.op != NFT_EXTHDR_OP_TCPOPT) {
                json_error(ctx, "Illegal TCP optstrip argument");
+               expr_free(expr);
                return NULL;
        }