projects
/
haproxy-2.3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b4cf7ab
)
BUG/MEDIUM: log-format: fix possible endless loop in parse_logformat_string()
author
Dragan Dosen
<ddosen@haproxy.com>
Tue, 30 Jun 2020 19:16:43 +0000
(21:16 +0200)
committer
Willy Tarreau
<w@1wt.eu>
Wed, 1 Jul 2020 04:30:50 +0000
(06:30 +0200)
This patch adds a missing break to end the loop in case when '%[' is not
properly closed with ']'.
The issue has been introduced with commit cd0d2ed ("MEDIUM: log-format:
make the LF parser aware of sample expressions' end").
src/log.c
patch
|
blob
|
history
diff --git
a/src/log.c
b/src/log.c
index
385bfc7
..
f2480b4
100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-683,6
+683,7
@@
int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
memprintf(err, "expected ']' after '%s', but found '%c'", var, c);
else
memprintf(err, "missing ']' after '%s'", var);
+ goto fail;
}
break;