haproxy: update to version 1.5.11 and pending patches
[feed/packages.git] / net / haproxy / patches / 0001-BUG-MINOR-pattern-error-message-missing.patch
1 From e338a8741983acc9a4501a03ecd593d89e6fade3 Mon Sep 17 00:00:00 2001
2 From: Thierry FOURNIER <tfournier@exceliance.fr>
3 Date: Fri, 6 Feb 2015 17:50:55 +0100
4 Subject: [PATCH 1/2] BUG/MINOR: pattern: error message missing
5
6 This patch must be backported in 1.5 version.
7 (cherry picked from commit 8aa8384e22dd0b66ded00c70a9c6034278b4bb69)
8 ---
9 src/pattern.c | 4 +++-
10 1 file changed, 3 insertions(+), 1 deletion(-)
11
12 diff --git a/src/pattern.c b/src/pattern.c
13 index 208e33a..a6fc52d 100644
14 --- a/src/pattern.c
15 +++ b/src/pattern.c
16 @@ -989,8 +989,10 @@ int pat_idx_list_ptr(struct pattern_expr *expr, struct pattern *pat, char **err)
17
18 /* allocate pattern */
19 patl = calloc(1, sizeof(*patl));
20 - if (!patl)
21 + if (!patl) {
22 + memprintf(err, "out of memory while indexing pattern");
23 return 0;
24 + }
25
26 /* duplicate pattern */
27 memcpy(&patl->pat, pat, sizeof(*pat));
28 --
29 2.0.4
30