mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: sink: Return an allocation failure in __sink_new if strdup() fails

Browse Source 
This patch fixes GitHub issue #1023.

The function was introduced in commit 99c453d ("MEDIUM: ring: new
section ring to declare custom ring buffers."), which first appeared
in 2.2-dev9. The fix should be backported to 2.2+.
This commit is contained in:
Tim Duesterhus 2021-01-03 19:54:11 +01:00 committed by Willy Tarreau
parent 5e8c35da1b
commit a7ebffef66
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sink.c
View File

@ -63,7 +63,13 @@ static struct sink *__sink_new(const char *name, const char *desc, int fmt)
goto end; goto end;
sink->name = strdup(name); sink->name = strdup(name);
if (!sink->name)
goto err;
sink->desc = strdup(desc); sink->desc = strdup(desc);
if (!sink->desc)
goto err;
sink->fmt = fmt; sink->fmt = fmt;
sink->type = SINK_TYPE_NEW; sink->type = SINK_TYPE_NEW;
sink->maxlen = BUFSIZE; sink->maxlen = BUFSIZE;
@ -74,6 +80,13 @@ static struct sink *__sink_new(const char *name, const char *desc, int fmt)
LIST_ADDQ(&sink_list, &sink->sink_list); LIST_ADDQ(&sink_list, &sink->sink_list);
end: end:
return sink; return sink;
err:
free(sink->name); sink->name = NULL;
free(sink->desc); sink->desc = NULL;
free(sink); sink = NULL;
return NULL;
} }
/* creates a sink called <name> of type FD associated to fd <fd>, format <fmt>, /* creates a sink called <name> of type FD associated to fd <fd>, format <fmt>,