simple_file: fix uninitialized variable/unchecked return

Signed-off-by: Peter Jones <pjones@redhat.com>
Upstream: pr#212

diff --git a/lib/simple_file.c b/lib/simple_file.c
index 3bf92ed8e0f82bf0b40b49e06916dfa355f3376b..6ad31b4dc044c4bd175de6f717fd6db0ebf5797c 100644 (file)
--- a/lib/simple_file.c
+++ b/lib/simple_file.c
@@ -403,10 +403,10 @@ simple_file_selector(EFI_HANDLE * im, CHAR16 ** title, CHAR16 * name,
                filter = L"";
        if (!*im) {
                EFI_HANDLE h;
-               CHAR16 *volname;
+               CHAR16 *volname = NULL;
 
-               simple_volume_selector(title, &volname, &h);
-               if (!volname)
+               efi_status = simple_volume_selector(title, &volname, &h);
+               if (EFI_ERROR(efi_status) || !volname)
                        return;
                FreePool(volname);
                *im = h;