genconf: fix memory corruption in error cases

Signed-off-by: Olivier Matz <zer0@droids-corp.org>

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;
 
+       *opaque = NULL;
        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)
 {
-       free(*opaque);
+       if (*opaque)
+               free(*opaque);
 }
 
 int help_conf_node(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)