git.droids-corp.org
/
libcmdline.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
genconf: fix memory corruption in error cases
[libcmdline.git]
/
src
/
genconf
/
parse_confnode.c
diff --git
a/src/genconf/parse_confnode.c
b/src/genconf/parse_confnode.c
index
033e45d
..
2a9ed06
100644
(file)
--- a/
src/genconf/parse_confnode.c
+++ b/
src/genconf/parse_confnode.c
@@
-198,6
+198,7
@@
complete_conf_node_start(cmdline_parse_token_hdr_t *tk,
unsigned flags = tkd->flags;
unsigned mask = tkd->mask;
unsigned flags = tkd->flags;
unsigned mask = tkd->mask;
+ *opaque = NULL;
cb = malloc(sizeof(*cb));
if (cb == NULL)
return -1;
cb = malloc(sizeof(*cb));
if (cb == NULL)
return -1;
@@
-241,7
+242,8
@@
complete_conf_node_iterate(cmdline_parse_token_hdr_t *tk, void **opaque,
static void
complete_conf_node_end(cmdline_parse_token_hdr_t *tk, void **opaque)
{
static void
complete_conf_node_end(cmdline_parse_token_hdr_t *tk, void **opaque)
{
- free(*opaque);
+ if (*opaque)
+ free(*opaque);
}
int help_conf_node(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)
}
int help_conf_node(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)