mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: checks: queues null-deref

Browse Source 
queues can be null if calloc() failed.
Bypass free* calls when calloc did fail.
This commit is contained in:
mildis 2018-10-02 16:46:34 +02:00 committed by Willy Tarreau
parent cd2d7de44e
commit 5ab01cb011
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/checks.c
View File

@ -3235,7 +3235,7 @@ int init_email_alert(struct mailers *mls, struct proxy *p, char **err)
if ((queues = calloc(mls->count, sizeof(*queues))) == NULL) { if ((queues = calloc(mls->count, sizeof(*queues))) == NULL) {
memprintf(err, "out of memory while allocating mailer alerts queues"); memprintf(err, "out of memory while allocating mailer alerts queues");
goto error; goto fail_no_queue;
} }
for (mailer = mls->mailer_list; mailer; i++, mailer = mailer->next) { for (mailer = mls->mailer_list; mailer; i++, mailer = mailer->next) {
@ -3292,6 +3292,7 @@ int init_email_alert(struct mailers *mls, struct proxy *p, char **err)
free_check(check); free_check(check);
} }
free(queues); free(queues);
fail_no_queue:
return 1; return 1;
} }