Really fix ae7b85

The previous fix leaves /half/ or /one quarter/ of the UINTN uninitialized, which has hilarious and unfortunate results. Instead, copy the value to an intermediate UINT16. Signed-off-by: Peter Jones <[email protected]>
rhboot · Aug 16, 2016 · fcc2249 · fcc2249
1 parent d218648
commit fcc2249
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/efi/fwupdate.c b/efi/fwupdate.c
@@ -599,8 +599,10 @@ open_file(EFI_DEVICE_PATH *dp, EFI_FILE_HANDLE *fh)
 		return EFI_UNSUPPORTED;
 	}
 
+	UINT16 sz16;
 	UINTN sz;
-	CopyMem(&sz, &file_dp->Length[0], 2);
+	CopyMem(&sz16, &file_dp->Length[0], sizeof(sz16));
+	sz = sz16;
 	sz -= 4;
 	if (sz <= 6 || sz % 2 != 0) {
 		Print(L"%a:%a():%d: Invalid file device path.\n",