Zero parser globals before use

[petitboot] / discover / yaboot-parser.c

diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index c47dee13c00189d0d9e3b71da9f018e78d3b7127..5224bb3dd23ca5162806a226742761552c864b20 100644 (file)
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-parser.c
@@ -24,7 +24,12 @@ static void yaboot_finish(struct conf_context *conf)
 {
        struct yaboot_state *state = conf->parser_info;
 
-       assert(state->desc_image);
+       if (!state->desc_image) {
+               pb_log("%s: %s: no image found\n", __func__,
+                       conf->dc->device->id);
+               return;
+       }
+
        assert(state->opt);
        assert(state->opt->name);
        assert(state->opt->boot_args);
@@ -235,6 +240,7 @@ static int yaboot_parse(struct discover_context *dc)
 
        conf->dc = dc;
        conf->global_options = yaboot_global_options,
+       conf_init_global_options(conf);
        conf->conf_files = yaboot_conf_files,
        conf->process_pair = yaboot_process_pair;
        conf->finish = yaboot_finish;