D9191.diff
No OneTemporary
Actions

Size

681 B

Referenced Files

None

Subscribers

None

D9191.diff
View Options

	Index: head/sys/boot/efi/loader/main.c
	===================================================================
	--- head/sys/boot/efi/loader/main.c
	+++ head/sys/boot/efi/loader/main.c
	@@ -219,20 +219,19 @@
	if (h == NULL)
	break;

	- if (efi_handle_lookup(h, dev, unit, extra) == 0) {
	- if (copy != NULL)
	- free(copy);
	+ free(copy);
	+ copy = NULL;
	+
	+ if (efi_handle_lookup(h, dev, unit, extra) == 0)
	return (0);
	- }

	- if (copy != NULL)
	- free(copy);
	devpath = efi_lookup_devpath(h);
	if (devpath != NULL) {
	copy = efi_devpath_trim(devpath);
	devpath = copy;
	}
	}
	+ free(copy);

	/* Try to fallback on first device */
	if (devsw[0] != NULL) {