chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
localectl: fix localectl set-x11-keymap syntax description
[elogind.git]
/
src
/
shared
/
conf-parser.h
diff --git
a/src/shared/conf-parser.h
b/src/shared/conf-parser.h
index 94185152cdecda1eb519925673d0c42d435c7cd0..62f2a01e5e6862294a27a5e64c08fc60401d9ef6 100644
(file)
--- a/
src/shared/conf-parser.h
+++ b/
src/shared/conf-parser.h
@@
-169,7
+169,8
@@
int log_syntax_internal(const char *unit, int level,
void *data, \
void *userdata) { \
\
void *data, \
void *userdata) { \
\
- type **enums = data, *xs, x, *ys; \
+ type **enums = data, x, *ys; \
+ _cleanup_free_ type *xs = NULL; \
const char *word, *state; \
size_t l, i = 0; \
\
const char *word, *state; \
size_t l, i = 0; \
\
@@
-186,6
+187,7
@@
int log_syntax_internal(const char *unit, int level,
\
FOREACH_WORD(word, l, rvalue, state) { \
_cleanup_free_ char *en = NULL; \
\
FOREACH_WORD(word, l, rvalue, state) { \
_cleanup_free_ char *en = NULL; \
+ type *new_xs; \
\
en = strndup(word, l); \
if (!en) \
\
en = strndup(word, l); \
if (!en) \
@@
-211,8
+213,10
@@
int log_syntax_internal(const char *unit, int level,
continue; \
\
*(xs + i) = x; \
continue; \
\
*(xs + i) = x; \
- xs = realloc(xs, (++i + 1) * sizeof(type)); \
- if (!xs) \
+ new_xs = realloc(xs, (++i + 1) * sizeof(type)); \
+ if (new_xs) \
+ xs = new_xs; \
+ else \
return -ENOMEM; \
\
*(xs + i) = invalid; \
return -ENOMEM; \
\
*(xs + i) = invalid; \
@@
-220,5
+224,7
@@
int log_syntax_internal(const char *unit, int level,
\
free(*enums); \
*enums = xs; \
\
free(*enums); \
*enums = xs; \
+ xs = NULL; \
+ \
return 0; \
}
return 0; \
}