1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

Update to -dev21.

This commit is contained in:
Dmitry Sivachenko 2013-12-17 02:42:28 +00:00
parent 1c6c6f328a
commit b5e8e74d69
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=336688
3 changed files with 3 additions and 36 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haproxy
DISTVERSION= 1.5-dev20
DISTVERSION= 1.5-dev21
CATEGORIES= net
MASTER_SITES= http://haproxy.1wt.eu/download/1.5/src/devel/
PKGNAMESUFFIX= -devel

View File

@ -1,2 +1,2 @@
SHA256 (haproxy-1.5-dev20.tar.gz) = 8cd2260f5392b8e135a838754cb08ecd2d571d83dd6a2a4589c2085c75484359
SIZE (haproxy-1.5-dev20.tar.gz) = 1197573
SHA256 (haproxy-1.5-dev21.tar.gz) = 08a242df5e8be21f52eb8696fcf6214993c5327bc900f3154aef2015824028ed
SIZE (haproxy-1.5-dev21.tar.gz) = 1198613

View File

@ -1,33 +0,0 @@
From 6762a3061ac0d1d8c8860a2191c602a3c526205c Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Mon, 16 Dec 2013 10:40:28 +0100
Subject: BUG/MAJOR: patterns: fix double free caused by loading strings from
files
A null pointer assignment was missing after a free in commit 7148ce6 (MEDIUM:
pattern: Extract the index process from the pat_parse_*() functions), causing
a double free after loading a file of string patterns.
This bug was introduced in 1.5-dev20, no backport is needed.
Thanks to Sander Klein for reporting this bug and providing the config
needed to trigger it.
---
src/pattern.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pattern.c b/src/pattern.c
index ce60f76..8380c63 100644
--- src/pattern.c
+++ src/pattern.c
@@ -882,6 +882,7 @@ int pattern_register(struct pattern_expr *expr, const char **args,
/* the "map_parser_str()" function always duplicate string information */
free((*pattern)->ptr.str);
+ (*pattern)->ptr.str = NULL;
/* we pre-set the data pointer to the tree's head so that functions
* which are able to insert in a tree know where to do that.
--
1.7.12.2.21.g234cd45.dirty