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: systemd: check return value of calloc()

Browse Source 
The wrapper is not the best reliable thing in the universe, so start
by adding at least the minimum expected controls :-/

To be backported to 1.5 and 1.6.
This commit is contained in:
Willy Tarreau 2016-10-25 17:05:56 +02:00
parent 4351ea61fb
commit 3747ea07ce
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/haproxy-systemd-wrapper.c
View File

@ -77,11 +77,17 @@ static void spawn_haproxy(char **pid_strv, int nb_pid)
pid = fork(); pid = fork();
if (!pid) { if (!pid) {
/* 3 for "haproxy -Ds -sf" */ char **argv;
char **argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *));
int i; int i;
int argno = 0; int argno = 0;
/* 3 for "haproxy -Ds -sf" */
argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *));
if (!argv) {
fprintf(stderr, SD_NOTICE "haproxy-systemd-wrapper: failed to calloc(), please try again later.\n");
exit(1);
}
reset_signal_handler(); reset_signal_handler();
locate_haproxy(haproxy_bin, 512); locate_haproxy(haproxy_bin, 512);
argv[argno++] = haproxy_bin; argv[argno++] = haproxy_bin;