mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: pattern/map: Each pattern must free the associated sample

Browse Source
This commit is contained in:
Thierry FOURNIER 2013-12-10 15:08:39 +01:00 committed by Willy Tarreau
parent 01cdcd4a62
commit c64de3f1bc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pattern.c
View File

@ -775,6 +775,7 @@ void pattern_free(struct pattern *pat)
free(pat->ptr.ptr); free(pat->ptr.ptr);
} }
free(pat->smp);
free(pat); free(pat);
} }
@ -795,6 +796,7 @@ void free_pattern_tree(struct eb_root *root)
next = eb_next(node); next = eb_next(node);
eb_delete(node); eb_delete(node);
elt = container_of(node, struct pat_idx_elt, node); elt = container_of(node, struct pat_idx_elt, node);
free(elt->smp);
free(elt); free(elt);
node = next; node = next;
} }
@ -1129,12 +1131,9 @@ int pattern_lookup(const char *key, struct pattern_expr *expr,
pat = NULL; pat = NULL;
elt = NULL; elt = NULL;
/* The current pattern is a tree, try to look up */
if (!eb_is_empty(&expr->pattern_tree)) {
/* IPv6 is not indexed */
if (pattern.type == SMP_T_IPV6)
goto browse_list;
/* Try to look up the tree first. IPv6 is not indexed */
if (!eb_is_empty(&expr->pattern_tree) && pattern.type != SMP_T_IPV6) {
/* Check the pattern type */ /* Check the pattern type */
if (pattern.type != SMP_T_STR && if (pattern.type != SMP_T_STR &&
pattern.type != SMP_T_CSTR && pattern.type != SMP_T_CSTR &&
@ -1176,6 +1175,7 @@ int pattern_lookup(const char *key, struct pattern_expr *expr,
} }
browse_list: browse_list:
elt = NULL;
if (expr->parse == pat_parse_int || if (expr->parse == pat_parse_int ||
expr->parse == pat_parse_len) { expr->parse == pat_parse_len) {
list_for_each_entry(pat, &expr->patterns, list) { list_for_each_entry(pat, &expr->patterns, list) {