diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-03-04 10:37:48 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-03-04 10:37:48 +0100 |
commit | 1ea71c23c2231e14cbfca059f8650e6709836361 (patch) | |
tree | ea2ef569c7979b042abe7aaaa0d49aded769420e /src/optimize.c | |
parent | 3f36cc6c3dcd5579841d169e495e49507846f3ce (diff) |
optimize: do not assume log prefix
... log prefix might not be present in log statements.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/optimize.c')
-rw-r--r-- | src/optimize.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/optimize.c b/src/optimize.c index f8dd7f8d..7a268c45 100644 --- a/src/optimize.c +++ b/src/optimize.c @@ -153,8 +153,16 @@ static bool __stmt_type_eq(const struct stmt *stmt_a, const struct stmt *stmt_b) stmt_a->log.qthreshold != stmt_b->log.qthreshold || stmt_a->log.level != stmt_b->log.level || stmt_a->log.logflags != stmt_b->log.logflags || - stmt_a->log.flags != stmt_b->log.flags || - stmt_a->log.prefix->etype != EXPR_VALUE || + stmt_a->log.flags != stmt_b->log.flags) + return false; + + if (!!stmt_a->log.prefix ^ !!stmt_b->log.prefix) + return false; + + if (!stmt_a->log.prefix) + return true; + + if (stmt_a->log.prefix->etype != EXPR_VALUE || stmt_b->log.prefix->etype != EXPR_VALUE || mpz_cmp(stmt_a->log.prefix->value, stmt_b->log.prefix->value)) return false; @@ -265,7 +273,8 @@ static int rule_collect_stmts(struct optimize_ctx *ctx, struct rule *rule) break; case STMT_LOG: memcpy(&clone->log, &stmt->log, sizeof(clone->log)); - clone->log.prefix = expr_get(stmt->log.prefix); + if (stmt->log.prefix) + clone->log.prefix = expr_get(stmt->log.prefix); break; default: break; |