c21234fad16cdb350f9d5b230eff879c8330450e
[feed/packages.git] / net / haproxy / patches / 0001-BUG-MEDIUM-patterns-previous-fix-was-incomplete.patch
1 From bad3c6f1b6d776e5d9951a3b3054b4dce8922c54 Mon Sep 17 00:00:00 2001
2 From: Willy Tarreau <w@1wt.eu>
3 Date: Wed, 26 Nov 2014 13:17:03 +0100
4 Subject: [PATCH 1/2] BUG/MEDIUM: patterns: previous fix was incomplete
5
6 Dmitry Sivachenko <trtrmitya@gmail.com> reported that commit 315ec42
7 ("BUG/MEDIUM: pattern: don't load more than once a pattern list.")
8 relies on an uninitialised variable in the stack. While it used to
9 work fine during the tests, if the uninitialized variable is non-null,
10 some patterns may be aggregated if loaded multiple times, resulting in
11 slower processing, which was the original issue it tried to address.
12
13 The fix needs to be backported to 1.5.
14 (cherry picked from commit 4deaf39243c4d941998b1b0175bad05b8a287c0b)
15 ---
16 src/pattern.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/src/pattern.c b/src/pattern.c
20 index 20547f9..208e33a 100644
21 --- a/src/pattern.c
22 +++ b/src/pattern.c
23 @@ -2096,7 +2096,7 @@ int pattern_read_from_file(struct pattern_head *head, unsigned int refflags,
24 struct pat_ref *ref;
25 struct pattern_expr *expr;
26 struct pat_ref_elt *elt;
27 - int reuse;
28 + int reuse = 0;
29
30 /* Lookup for the existing reference. */
31 ref = pat_ref_lookup(filename);
32 --
33 2.0.4
34