discover/boot: Fix stale boot cancellation codev1.7.1

In dc85de97 "Allow load_async_url() to call callback for local paths"
several load_url_result fields of the boot_task struct were deprecated
but were accidentally left in the struct. This caused the now out of
date code in cleanup_cancellations() to go unnoticed since it can return
safely if these fields are NULL. However freeing the boot task can free
the memory associated with each load before it is complete, resulting in
a confusing segfault.

This brings cleanup_cancellations() up to date and along the way
implicitly includes the signature resources in cleanup which were missed
originally.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>

1 files changed, 0 insertions, 7 deletions

diff --git a/discover/boot.h b/discover/boot.h
index 0f3dcf7..7fe285b 100644
--- a/discover/boot.h
+++ b/discover/boot.h
@@ -16,9 +16,6 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 void boot_cancel(struct boot_task *task);
 
 struct boot_task {
-	struct load_url_result *image;
-	struct load_url_result *initrd;
-	struct load_url_result *dtb;
 	const char *local_image;
 	const char *local_initrd;
 	const char *local_dtb;
@@ -33,10 +30,6 @@ struct boot_task {
 	bool cancelled;
 	bool verify_signature;
 	bool decrypt_files;
-	struct load_url_result *image_signature;
-	struct load_url_result *initrd_signature;
-	struct load_url_result *dtb_signature;
-	struct load_url_result *cmdline_signature;
 	const char *local_image_signature;
 	const char *local_initrd_signature;
 	const char *local_dtb_signature;