upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-20 00:10:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

BUG/MINOR: commit 196729ef used wrong condition resulting in freeing constants

Browse source 
Recent commit 196729ef had inverted condition to free format strings. No
backport is needed, it was never released.
This commit is contained in:
Willy Tarreau 2012-06-01 10:58:06 +02:00
parent 496aa0111e
commit 39b0665bc7
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cfgparse.c
View file

@ -1610,9 +1610,9 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
free(defproxy.expect_str);
if (defproxy.expect_regex) regfree(defproxy.expect_regex);
if (defproxy.logformat_string == default_http_log_format ||
defproxy.logformat_string == default_tcp_log_format ||
defproxy.logformat_string == clf_http_log_format)
if (defproxy.logformat_string != default_http_log_format &&
defproxy.logformat_string != default_tcp_log_format &&
defproxy.logformat_string != clf_http_log_format)
free(defproxy.logformat_string);
free(defproxy.uniqueid_format_string);

6
src/haproxy.c
View file

@ -830,9 +830,9 @@ void deinit(void)
free(p->capture_name);
free(p->monitor_uri);
free(p->rdp_cookie_name);
if (p->logformat_string == default_http_log_format ||
p->logformat_string == default_tcp_log_format ||
p->logformat_string == clf_http_log_format)
if (p->logformat_string != default_http_log_format &&
p->logformat_string != default_tcp_log_format &&
p->logformat_string != clf_http_log_format)
free(p->logformat_string);
free(p->uniqueid_format_string);