mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM server: Fix crash when dynamic is defined, but not key is provided.

Browse Source 
Wait until we're sure we have a key before trying to calculate its length.

[wt: no backport needed, was just merged]
This commit is contained in:
Olivier Houchard 2017-03-15 15:11:06 +01:00 committed by Willy Tarreau
parent 3569df3fcf
commit 2cb49ebbc4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server.c
View File

@ -85,7 +85,7 @@ void srv_set_dyncookie(struct server *s)
struct server *tmpserv; struct server *tmpserv;
char *tmpbuf; char *tmpbuf;
unsigned long long hash_value; unsigned long long hash_value;
size_t key_len = strlen(p->dyncookie_key); size_t key_len;
size_t buffer_len; size_t buffer_len;
int addr_len; int addr_len;
int port; int port;
@ -94,6 +94,7 @@ void srv_set_dyncookie(struct server *s)
!(s->proxy->ck_opts & PR_CK_DYNAMIC) || !(s->proxy->ck_opts & PR_CK_DYNAMIC) ||
s->proxy->dyncookie_key == NULL) s->proxy->dyncookie_key == NULL)
return; return;
key_len = strlen(p->dyncookie_key);
if (s->addr.ss_family != AF_INET && if (s->addr.ss_family != AF_INET &&
s->addr.ss_family != AF_INET6) s->addr.ss_family != AF_INET6)