Changeset 58513 in vbox

Timestamp:

Oct 30, 2015 12:41:16 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103834

Message:

IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c: BdsLibGetImageHeader: Dunno what someone was smoking here - how can DosHeaders be NULL? Anyway, reduced the mess a little by simplifying the seemingly pointless fAnalyzeDosHeader changes.

File:

• trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c

@@ -408 +408 @@
   FreePool (TempOptionPtr);
   FreePool (OptionOrderPtr);
-
   VBoxLogFlowFuncLeaveRC(Status);
   return Status;
@@ -1292 +1291 @@
   Status = ThisFile->Read (ThisFile, &BufferSize, DosHeader);
   VBoxLogFlowFuncMarkRC(Status);
-  if (
-#ifdef VBOX
-       fAnalyzeDosHeader &&
+#ifdef VBOX /** @todo r=bird: It's anyone's wild guess wtf we do this here...
+             * I mean, the read should fail if DosHeader is NULL, right?
+             * So, why don't we just get rid of this non-sense? */
+ if (fAnalyzeDosHeader)
+ {
 #endif
-         (   EFI_ERROR (Status)
-          || BufferSize < sizeof (EFI_IMAGE_DOS_HEADER)
-          || FileSize <= DosHeader->e_lfanew
-          || DosHeader->e_magic != EFI_IMAGE_DOS_SIGNATURE)) {
+  if (EFI_ERROR (Status) ||
+      BufferSize < sizeof (EFI_IMAGE_DOS_HEADER) ||
+      FileSize <= DosHeader->e_lfanew ||
+      DosHeader->e_magic != EFI_IMAGE_DOS_SIGNATURE) {
     Status = EFI_LOAD_ERROR;
     VBoxLogFlowFuncMarkRC(Status);
@@ -1305 +1306 @@
   }
 
-#ifdef VBOX
-    if (fAnalyzeDosHeader)
- {
-#endif
   //
   // Move to PE signature
@@ -1344 +1341 @@
   }
 #ifdef VBOX
-    }
+ }
 #endif