From c9aeee22f1c61e08e48fb6df12c58a2b25f8b7e7 Mon Sep 17 00:00:00 2001 From: Tim Duesterhus Date: Sat, 22 Feb 2020 16:39:05 +0100 Subject: [PATCH] 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. (cherry picked from commit 017484c80f2fd265281853fdf0bc816b19a751da) Signed-off-by: Christopher Faulet --- src/cfgparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index 2a22405..d7a22cf 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -3661,7 +3661,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; -- 1.7.10.4