projects
/
haproxy-2.5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c12025
)
BUG/MINOR: ssl: Correctly add the 1 for the sentinel to the number of elements
author
Tim Duesterhus
<tim@bastelstu.be>
Thu, 19 Mar 2020 15:12:10 +0000
(16:12 +0100)
committer
William Lallemand
<wlallemand@haproxy.org>
Fri, 20 Mar 2020 08:43:53 +0000
(09:43 +0100)
In `crtlist_dup_filters()` add the `1` to the number of elements instead of
the size of a single element.
This bug was introduced in commit
2954c478ebab019b814b97cbaec4653af7f03f34
,
which is 2.2+. No backport needed.
src/ssl_sock.c
patch
|
blob
|
history
diff --git
a/src/ssl_sock.c
b/src/ssl_sock.c
index
3ff8172
..
ea513b2
100644
(file)
--- a/
src/ssl_sock.c
+++ b/
src/ssl_sock.c
@@
-4656,7
+4656,7
@@
static char **crtlist_dup_filters(char **args, int fcount)
char **dst;
int i;
- dst = calloc(fcount, sizeof(*dst) + 1);
+ dst = calloc(fcount + 1, sizeof(*dst));
if (!dst)
return NULL;