mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 05:41:26 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: pattern: Do not pass len = 0 to calloc()

Browse Source 
The behavior of calloc() when being passed `0` as `nelem` is implementation
defined. It may return a NULL pointer.

Avoid this issue by checking before allocating. While doing so adjust the local
integer variables that are used to refer to memory offsets to `size_t`.

This issue was introced in commit f91ac19299fe216a793ba6550dca06b688b31549. This
patch should be backported together with that commit.
This commit is contained in:
Tim Duesterhus 2020-03-17 21:08:24 +01:00 committed by Willy Tarreau
parent a64593c80d
commit b584b4475b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pattern.c
View File

@ -2660,10 +2660,10 @@ static int cmp_pat_ref(const void *_a, const void *_b)
*/ */
int pattern_finalize_config(void) int pattern_finalize_config(void)
{ {
int len = 0; size_t len = 0;
int unassigned_pos = 0; size_t unassigned_pos = 0;
int next_unique_id = 0; int next_unique_id = 0;
int i, j; size_t i, j;
struct pat_ref *ref, **arr; struct pat_ref *ref, **arr;
struct list pr = LIST_HEAD_INIT(pr); struct list pr = LIST_HEAD_INIT(pr);
@ -2676,6 +2676,10 @@ int pattern_finalize_config(void)
unassigned_pos++; unassigned_pos++;
} }
if (len == 0) {
return 0;
}
arr = calloc(len, sizeof(*arr)); arr = calloc(len, sizeof(*arr));
if (arr == NULL) { if (arr == NULL) {
ha_alert("Out of memory error.\n"); ha_alert("Out of memory error.\n");