diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-06-17 12:31:11 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-06-18 09:40:20 +0200 |
| commit | 23939b625bb7f0e5d9743f3dd286d73216b7f7e1 (patch) | |
| tree | 4ed4c0acb0ed176a632c1fe75dcdee6661df3665 /src/segtree.c | |
| parent | e2c0529c7fe40be9f3f3c0131d26f44fe8fdc408 (diff) | |
segtree: memleak in error path of the set to segtree conversion
Release the array of intervals and the segtree in case of error,
otherwise these structures and objects are never released:
SUMMARY: AddressSanitizer: 2864 byte(s) leaked in 37 allocation(s).
Moreover, improve existing a test coverage of this error path.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/segtree.c')
| -rw-r--r-- | src/segtree.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/segtree.c b/src/segtree.c index 5eaf6845..f721954f 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -288,6 +288,7 @@ out: return 0; err: + mpz_clear(p); errno = EEXIST; if (new->expr->etype == EXPR_MAPPING) { new_expr = new->expr->left; @@ -437,7 +438,7 @@ static int set_to_segtree(struct list_head *msgs, struct set *set, { struct elementary_interval **intervals; struct expr *i, *next; - unsigned int n; + unsigned int n, m; int err = 0; /* We are updating an existing set with new elements, check if the new @@ -467,8 +468,19 @@ static int set_to_segtree(struct list_head *msgs, struct set *set, */ for (n = 0; n < init->size; n++) { err = ei_insert(msgs, tree, intervals[n], merge); - if (err < 0) + if (err < 0) { + struct elementary_interval *ei; + struct rb_node *node, *next; + + for (m = n; m < init->size; m++) + ei_destroy(intervals[m]); + + rb_for_each_entry_safe(ei, node, next, &tree->root, rb_node) { + ei_remove(tree, ei); + ei_destroy(ei); + } break; + } } xfree(intervals); |