picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared: conf-parser - don't leak memory on error in DEFINE_CONFIG_PARSE_ENUMV 

Found by Coverity. Fixes CID #1237746.
This commit is contained in:
Tom Gundersen 2014-09-18 13:47:00 +02:00
parent 9dedfe7f66
commit 77c10205bb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/conf-parser.h
View File

@ -169,7 +169,8 @@ int log_syntax_internal(const char *unit, int level,
void *data, \ void *data, \
void *userdata) { \ void *userdata) { \
\ \
type **enums = data, *xs, x, *ys; \ type **enums = data, x, *ys; \
_cleanup_free_ type *xs = NULL; \
const char *word, *state; \ const char *word, *state; \
size_t l, i = 0; \ size_t l, i = 0; \
\ \
@ -186,6 +187,7 @@ int log_syntax_internal(const char *unit, int level,
\ \
FOREACH_WORD(word, l, rvalue, state) { \ FOREACH_WORD(word, l, rvalue, state) { \
_cleanup_free_ char *en = NULL; \ _cleanup_free_ char *en = NULL; \
type *new_xs; \
\ \
en = strndup(word, l); \ en = strndup(word, l); \
if (!en) \ if (!en) \
@ -211,8 +213,10 @@ int log_syntax_internal(const char *unit, int level,
continue; \ continue; \
\ \
*(xs + i) = x; \ *(xs + i) = x; \
xs = realloc(xs, (++i + 1) * sizeof(type)); \ new_xs = realloc(xs, (++i + 1) * sizeof(type)); \
if (!xs) \ if (new_xs) \
xs = new_xs; \
else \
return -ENOMEM; \ return -ENOMEM; \
\ \
*(xs + i) = invalid; \ *(xs + i) = invalid; \
@ -220,5 +224,7 @@ int log_syntax_internal(const char *unit, int level,
\ \
free(*enums); \ free(*enums); \
*enums = xs; \ *enums = xs; \
xs = NULL; \
\
return 0; \ return 0; \
} }