Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiCompress.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

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

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ShellPkg/Library/UefiShellDebug1CommandsLib/EfiCompress.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiCompress.c

@@ -49 +49 @@
   OutShellFileHandle = NULL;
   InBuffer           = NULL;
+  Package            = NULL;
 
   //
@@ -80 +81 @@
     } else {
       TempParam = ShellCommandLineGetRawValue (Package, 1);
-      ASSERT (TempParam != NULL);
+      if (TempParam == NULL) {
+        ASSERT (TempParam != NULL);
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"eficompress");
+        ShellStatus = SHELL_INVALID_PARAMETER;
+        goto Exit;
+      }
+
       InFileName  = ShellFindFilePath (TempParam);
       OutFileName = ShellCommandLineGetRawValue (Package, 2);
-      if (InFileName == NULL) {
+      if ((InFileName == NULL) || (OutFileName == NULL)) {
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_FILE_FIND_FAIL), gShellDebug1HiiHandle, L"eficompress", TempParam);
         ShellStatus = SHELL_NOT_FOUND;
@@ -151 +158 @@
   }
 
+Exit:
+  if ((ShellStatus != SHELL_SUCCESS) && (Package != NULL)) {
+    ShellCommandLineFreeVarList (Package);
+  }
+
   if (InShellFileHandle != NULL) {
     gEfiShellProtocol->CloseFile (InShellFileHandle);