From 564b0e7c13f98b9ad054058137b4c0bb61bd46b4 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 5 Dec 2015 20:04:22 +0100 Subject: netlink_delinearize: postprocess expression before range merge Dependency statement go away after postprocess, so we should consider them for possible range merges. This problem was uncovered when adding support for sub-byte payload ranges. Signed-off-by: Pablo Neira Ayuso --- src/netlink_delinearize.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/netlink_delinearize.c') diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index e5cee163..8cbabc34 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1558,11 +1558,11 @@ static void stmt_expr_postprocess(struct rule_pp_ctx *ctx, struct stmt *prev) { enum ops op; - if (prev && ctx->stmt->ops->type == prev->ops->type && + expr_postprocess(ctx, &ctx->stmt->expr); + + if (prev && ctx->stmt && ctx->stmt->ops->type == prev->ops->type && expr_may_merge_range(ctx->stmt->expr, prev->expr, &op)) expr_postprocess_range(ctx, prev, op); - - expr_postprocess(ctx, &ctx->stmt->expr); } static void rule_parse_postprocess(struct netlink_parse_ctx *ctx, struct rule *rule) -- cgit v1.2.3