]> git.proxmox.com Git - mirror_edk2.git/blobdiff - ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c
comp - add comments and add input verification
[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / EfiDecompress.c
index 3d01515f05874037c5a6040a7ab5543222a739ee..4b4671b4554f8efd2c944c3c97c0c4047cdb397c 100644 (file)
 #include <Protocol/Decompress.h>\r
 \r
 \r
+/**\r
+  Function for 'decompress' command.\r
+\r
+  @param[in] ImageHandle  Handle to the Image (NULL if Internal).\r
+  @param[in] SystemTable  Pointer to the System Table (NULL if Internal).\r
+**/\r
 SHELL_STATUS\r
 EFIAPI\r
 ShellCommandRunEfiDecompress (\r
@@ -27,8 +33,8 @@ ShellCommandRunEfiDecompress (
   LIST_ENTRY          *Package;\r
   CHAR16              *ProblemParam;\r
   SHELL_STATUS        ShellStatus;\r
-  SHELL_FILE_HANDLE              InFileHandle;\r
-  SHELL_FILE_HANDLE              OutFileHandle;\r
+  SHELL_FILE_HANDLE   InFileHandle;\r
+  SHELL_FILE_HANDLE   OutFileHandle;\r
   UINT32              OutSize;\r
   UINTN               OutSizeTemp;\r
   VOID                *OutBuffer;\r
@@ -36,7 +42,7 @@ ShellCommandRunEfiDecompress (
   VOID                *InBuffer;\r
   CHAR16              *InFileName;\r
   CONST CHAR16        *OutFileName;\r
-  UINT64              temp;\r
+  UINT64              Temp64Bit;\r
   UINT32              ScratchSize;\r
   VOID                *ScratchBuffer;\r
   EFI_DECOMPRESS_PROTOCOL *Decompress;\r
@@ -83,81 +89,84 @@ ShellCommandRunEfiDecompress (
     } else {\r
       InFileName = ShellFindFilePath(ShellCommandLineGetRawValue(Package, 1));\r
       OutFileName = ShellCommandLineGetRawValue(Package, 2);\r
-      Status = ShellOpenFileByName(InFileName, &InFileHandle, EFI_FILE_MODE_READ, 0);\r
-      if (EFI_ERROR(Status)) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_OPEN_FAIL), gShellDebug1HiiHandle, ShellCommandLineGetRawValue(Package, 1), Status);\r
-        ShellStatus = SHELL_NOT_FOUND;\r
-      }\r
-      Status = ShellOpenFileByName(OutFileName, &OutFileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);\r
-      if (EFI_ERROR(Status)) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_OPEN_FAIL), gShellDebug1HiiHandle, ShellCommandLineGetRawValue(Package, 2), Status);\r
+      if (InFileName == NULL) {\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_FIND_FAIL), gShellDebug1HiiHandle, ShellCommandLineGetRawValue(Package, 1));\r
         ShellStatus = SHELL_NOT_FOUND;\r
-      }\r
-      if (FileHandleIsDirectory(InFileHandle) == EFI_SUCCESS){\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, InFileName);\r
-        ShellStatus = SHELL_INVALID_PARAMETER;\r
-      }\r
-      if (FileHandleIsDirectory(OutFileHandle) == EFI_SUCCESS){\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, OutFileName);\r
-        ShellStatus = SHELL_INVALID_PARAMETER;\r
-      }\r
-      Status = FileHandleGetSize(InFileHandle, &temp);\r
-      ASSERT(temp <= (UINT32)(-1));\r
-      InSize = (UINTN)temp;\r
-      ASSERT_EFI_ERROR(Status);\r
-      InBuffer = AllocatePool(InSize);\r
-      ASSERT(InBuffer != NULL);\r
-      Status = gEfiShellProtocol->ReadFile(InFileHandle, &InSize, InBuffer);\r
-      ASSERT_EFI_ERROR(Status);\r
-\r
-      Status = gBS->LocateProtocol(&gEfiDecompressProtocolGuid, NULL, (VOID**)&Decompress);\r
-      ASSERT_EFI_ERROR(Status);\r
-\r
-      Status = Decompress->GetInfo(Decompress, InBuffer, (UINT32)InSize, &OutSize, &ScratchSize);\r
-      ASSERT_EFI_ERROR(Status);\r
-\r
-      OutBuffer = AllocatePool(OutSize);\r
-      ScratchBuffer = AllocatePool(ScratchSize);\r
-      ASSERT(OutBuffer != NULL);\r
-      ASSERT(ScratchBuffer != NULL);\r
-\r
-      Status = Decompress->Decompress(Decompress, InBuffer, (UINT32)InSize, OutBuffer, OutSize, ScratchBuffer, ScratchSize);\r
-      ASSERT_EFI_ERROR(Status);\r
-\r
-      if (EFI_ERROR(Status)) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_EFI_DECOMPRESS_FAIL), gShellDebug1HiiHandle, Status);\r
-        ShellStatus = SHELL_DEVICE_ERROR;\r
       } else {\r
-        OutSizeTemp = OutSize;\r
-        Status = gEfiShellProtocol->WriteFile(OutFileHandle, &OutSizeTemp, OutBuffer);\r
-        OutSize = (UINT32)OutSizeTemp;\r
-        if (EFI_ERROR(Status)) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_WRITE_FAIL), gShellDebug1HiiHandle, OutFileName, Status);\r
-          ShellStatus = SHELL_DEVICE_ERROR;\r
+        if (ShellIsDirectory(InFileName) == EFI_SUCCESS){\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, InFileName);\r
+          ShellStatus = SHELL_INVALID_PARAMETER;\r
+        }\r
+        if (ShellIsDirectory(OutFileName) == EFI_SUCCESS){\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, OutFileName);\r
+          ShellStatus = SHELL_INVALID_PARAMETER;\r
+        }\r
+        if (ShellStatus == SHELL_SUCCESS) {\r
+          Status = ShellOpenFileByName(InFileName, &InFileHandle, EFI_FILE_MODE_READ, 0);\r
+          if (EFI_ERROR(Status)) {\r
+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_OPEN_FAIL), gShellDebug1HiiHandle, ShellCommandLineGetRawValue(Package, 1), Status);\r
+            ShellStatus = SHELL_NOT_FOUND;\r
+          }\r
+          Status = ShellOpenFileByName(OutFileName, &OutFileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);\r
+          if (EFI_ERROR(Status)) {\r
+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_OPEN_FAIL), gShellDebug1HiiHandle, ShellCommandLineGetRawValue(Package, 2), Status);\r
+            ShellStatus = SHELL_NOT_FOUND;\r
+          }\r
+        }\r
+\r
+        if (ShellStatus == SHELL_SUCCESS) {\r
+          Status = FileHandleGetSize(InFileHandle, &Temp64Bit);\r
+          ASSERT(Temp64Bit <= (UINT32)(-1));\r
+          InSize = (UINTN)Temp64Bit;\r
+          ASSERT_EFI_ERROR(Status);\r
+          InBuffer = AllocateZeroPool(InSize);\r
+          ASSERT(InBuffer != NULL);\r
+          Status = gEfiShellProtocol->ReadFile(InFileHandle, &InSize, InBuffer);\r
+          ASSERT_EFI_ERROR(Status);\r
+\r
+          Status = gBS->LocateProtocol(&gEfiDecompressProtocolGuid, NULL, (VOID**)&Decompress);\r
+          ASSERT_EFI_ERROR(Status);\r
+\r
+          Status = Decompress->GetInfo(Decompress, InBuffer, (UINT32)InSize, &OutSize, &ScratchSize);\r
+          ASSERT_EFI_ERROR(Status);\r
+\r
+          OutBuffer = AllocateZeroPool(OutSize);\r
+          ScratchBuffer = AllocateZeroPool(ScratchSize);\r
+          ASSERT(OutBuffer != NULL);\r
+          ASSERT(ScratchBuffer != NULL);\r
+\r
+          Status = Decompress->Decompress(Decompress, InBuffer, (UINT32)InSize, OutBuffer, OutSize, ScratchBuffer, ScratchSize);\r
+          ASSERT_EFI_ERROR(Status);\r
+\r
+          if (EFI_ERROR(Status)) {\r
+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_EFI_DECOMPRESS_FAIL), gShellDebug1HiiHandle, Status);\r
+            ShellStatus = SHELL_DEVICE_ERROR;\r
+          } else {\r
+            OutSizeTemp = OutSize;\r
+            Status = gEfiShellProtocol->WriteFile(OutFileHandle, &OutSizeTemp, OutBuffer);\r
+            OutSize = (UINT32)OutSizeTemp;\r
+            if (EFI_ERROR(Status)) {\r
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_WRITE_FAIL), gShellDebug1HiiHandle, OutFileName, Status);\r
+              ShellStatus = SHELL_DEVICE_ERROR;\r
+            }\r
+          }\r
         }\r
       }\r
     }\r
 \r
     ShellCommandLineFreeVarList (Package);\r
   }\r
-  if (InFileName != NULL) {\r
-    FreePool(InFileName);\r
-  }\r
   if (InFileHandle != NULL) {\r
     gEfiShellProtocol->CloseFile(InFileHandle);\r
   }\r
   if (OutFileHandle != NULL) {\r
     gEfiShellProtocol->CloseFile(OutFileHandle);\r
   }\r
-  if (InBuffer != NULL) {\r
-    FreePool(InBuffer);\r
-  }\r
-  if (OutBuffer != NULL) {\r
-    FreePool(OutBuffer);\r
-  }\r
-  if (ScratchBuffer != NULL) {\r
-    FreePool(ScratchBuffer);\r
-  }\r
+\r
+  SHELL_FREE_NON_NULL(InFileName);\r
+  SHELL_FREE_NON_NULL(InBuffer);\r
+  SHELL_FREE_NON_NULL(OutBuffer);\r
+  SHELL_FREE_NON_NULL(ScratchBuffer);\r
 \r
   return (ShellStatus);\r
 }\r