Merge tag 'v1.2.3'

version: 1.2.3

Merge fixes from 1.2.3 into main trunk

6 files changed, 17 insertions, 4 deletions

diff --git a/HashTool.c b/HashTool.c
index 780f6a9..a096662 100644
--- a/HashTool.c
+++ b/HashTool.c
@@ -70,7 +70,7 @@ enroll_hash(void)
 			L"This means it will Subsequently Boot with no prompting",
 			L"Remember to make sure it is a genuine binary before Enroling its hash",
 			NULL
-		}, L"\\", NULL, &file_name);
+		}, L"\\", L"", &file_name);
 
 	if (!file_name)
 		/* user pressed ESC */
diff --git a/KeyTool.c b/KeyTool.c
index d058652..bae1a2b 100644
--- a/KeyTool.c
+++ b/KeyTool.c
@@ -97,7 +97,7 @@ select_and_apply(CHAR16 **title, CHAR16 *ext, int key, UINTN options)
 	EFI_HANDLE h = NULL;
 	int use_setsecurevariable = 0;
 
-	simple_file_selector(&h, title, NULL, ext, &file_name);
+	simple_file_selector(&h, title, L"\\", ext, &file_name);
 	if (file_name == NULL)
 		return;
 
diff --git a/Makefile b/Makefile
index 532465e..24e60e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 EFIFILES = HelloWorld.efi LockDown.efi Loader.efi ReadVars.efi UpdateVars.efi \
-	KeyTool.efi HashTool.efi PreLoader.efi
+	KeyTool.efi HashTool.efi PreLoader.efi SetNull.efi
 BINARIES = cert-to-efi-sig-list sig-list-to-certs sign-efi-sig-list \
 	hash-to-efi-sig-list
 
diff --git a/SetNull.c b/SetNull.c
new file mode 100644
index 0000000..566fac0
--- /dev/null
+++ b/SetNull.c
@@ -0,0 +1,11 @@
+#include <efi.h>
+
+EFI_STATUS
+efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
+{
+	int *test = NULL;
+
+	*test = 0x123;
+
+	return EFI_SUCCESS;
+}
diff --git a/include/version.h b/include/version.h
index b3db040..2145d42 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,4 +1,4 @@
-#define VERSION "1.2.1"
+#define VERSION "1.2.3"
 
 static void
 version(const char *progname)
diff --git a/lib/simple_file.c b/lib/simple_file.c
index 53530e6..40ebf27 100644
--- a/lib/simple_file.c
+++ b/lib/simple_file.c
@@ -405,6 +405,8 @@ simple_file_selector(EFI_HANDLE *im, CHAR16 **title, CHAR16 *name,
 	*result = NULL;
 	if (!name)
 		name = L"\\";
+	if (!filter)
+		filter = L"";
 	if (!*im) {
 		EFI_HANDLE h;
 		CHAR16 *volname;