From: Olivier Houchard <ohouchard@haproxy.com>
Date: Wed, 15 Mar 2017 14:11:06 +0000 (+0100)
Subject: BUG/MEDIUM server: Fix crash when dynamic is defined, but not key is provided.
X-Git-Tag: v1.8-dev1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cb49ebbc4f0bb39ef98bc1e59fa32affdb7c570;p=thirdparty%2Fhaproxy.git

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

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

[wt: no backport needed, was just merged]
---

diff --git a/src/server.c b/src/server.c
index 4e03e50a46..5589723efb 100644
--- a/src/server.c
+++ b/src/server.c
@@ -85,7 +85,7 @@ void srv_set_dyncookie(struct server *s)
 	struct server *tmpserv;
 	char *tmpbuf;
 	unsigned long long hash_value;
-	size_t key_len = strlen(p->dyncookie_key);
+	size_t key_len;
 	size_t buffer_len;
 	int addr_len;
 	int port;
@@ -94,6 +94,7 @@ void srv_set_dyncookie(struct server *s)
 	    !(s->proxy->ck_opts & PR_CK_DYNAMIC) ||
 	    s->proxy->dyncookie_key == NULL)
 		return;
+	key_len = strlen(p->dyncookie_key);
 
 	if (s->addr.ss_family != AF_INET &&
 	    s->addr.ss_family != AF_INET6)