From: Tim Duesterhus <tim@bastelstu.be>
Date: Sat, 22 Feb 2020 15:39:05 +0000 (+0100)
Subject: CLEANUP: cfgparse: Fix type of second calloc() parameter
X-Git-Tag: v2.2-dev3~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017484c80f2fd265281853fdf0bc816b19a751da;p=thirdparty%2Fhaproxy.git

CLEANUP: cfgparse: Fix type of second calloc() parameter

`curr_idle_thr` is of type `unsigned int`, not `int`. Fix this issue by
taking the size of the dereferenced `curr_idle_thr` array.

This issue was introduced when adding the `curr_idle_thr` struct member
in commit f131481a0af79037bc6616edf450ae81d80084d7. This commit is first
tagged in 2.0-dev1 and marked for backport to 1.9.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 8ad64bcf9b..68cb0e9803 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3654,7 +3654,7 @@ out_uri_auth_compat:
 					goto err;
 				for (i = 0; i < global.nbthread; i++)
 					MT_LIST_INIT(&newsrv->idle_orphan_conns[i]);
-				newsrv->curr_idle_thr = calloc(global.nbthread, sizeof(int));
+				newsrv->curr_idle_thr = calloc(global.nbthread, sizeof(*newsrv->curr_idle_thr));
 				if (!newsrv->curr_idle_thr)
 					goto err;
 				continue;