]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: cfgparse: Fix type of second calloc() parameter
authorTim Duesterhus <tim@bastelstu.be>
Sat, 22 Feb 2020 15:39:05 +0000 (16:39 +0100)
committerWilly Tarreau <w@1wt.eu>
Tue, 25 Feb 2020 06:42:51 +0000 (07:42 +0100)
`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.

src/cfgparse.c

index 8ad64bcf9b01731fd836c392b4939bf8d9e49b50..68cb0e98034138edf8f90a7ed6d673a39504ff80 100644 (file)
@@ -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;