From b155a07583e33d51313b5747b961f5075e7465b2 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 2 May 2013 10:20:39 +0800 Subject: [PATCH 1/1] discover: detect unresolvable resources We don't want to call NULL resolve_resource callbacks. Signed-off-by: Jeremy Kerr --- discover/device-handler.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/discover/device-handler.c b/discover/device-handler.c index d3274bc..b2922b7 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -149,8 +149,17 @@ static void context_commit(struct device_handler *handler, discover_server_notify_boot_option_add(handler->server, opt->option); } else { - list_add(&handler->unresolved_boot_options, &opt->list); - talloc_steal(handler, opt); + if (!opt->source->resolve_resource) { + pb_log("parser %s gave us an unresolved " + "resource (%s), but no way to " + "resolve it\n", + opt->source->name, opt->option->id); + talloc_free(opt); + } else { + list_add(&handler->unresolved_boot_options, + &opt->list); + talloc_steal(handler, opt); + } } } } -- 2.39.2