ShellPkg/DmpStore: fix GCC/CLANG build failure

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / EfiDecompress.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c
index 6b6218e1c8b3bbb198d94a7d4d25d630e6180b71..28c37ee76985de1a12969e8c37c7f57ab1e13812 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c
@@ -1,8 +1,8 @@
 /** @file\r
   Main file for EfiDecompress shell Debug1 function.\r
 \r
-  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -52,6 +52,7 @@ ShellCommandRunEfiDecompress (
   InFileName          = NULL;\r
   OutFileName         = NULL;\r
   OutSize             = 0;\r
+  ScratchSize         = 0;\r
   ShellStatus         = SHELL_SUCCESS;\r
   Status              = EFI_SUCCESS;\r
   OutBuffer           = NULL;\r
@@ -59,6 +60,7 @@ ShellCommandRunEfiDecompress (
   ScratchBuffer       = NULL;\r
   InFileHandle        = NULL;\r
   OutFileHandle       = NULL;\r
+  Decompress          = NULL;\r
 \r
   //\r
   // initialize the shell lib (we must be in non-auto-init...)\r
@@ -119,14 +121,18 @@ ShellCommandRunEfiDecompress (
           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
+          if (InBuffer == NULL) {\r
+            Status = EFI_OUT_OF_RESOURCES;\r
+          } else {\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
+            Status = gBS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, (VOID**) &Decompress);\r
+            ASSERT_EFI_ERROR (Status);\r
+\r
+            Status = Decompress->GetInfo (Decompress, InBuffer, (UINT32) InSize, &OutSize, &ScratchSize);\r
+          }\r
 \r
-          Status = Decompress->GetInfo(Decompress, InBuffer, (UINT32)InSize, &OutSize, &ScratchSize);\r
           if (EFI_ERROR(Status) || OutSize == 0) {\r
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_EFI_DECOMPRESS_NOPE), gShellDebug1HiiHandle, InFileName);\r
             ShellStatus = SHELL_NOT_FOUND;\r
@@ -138,25 +144,25 @@ ShellCommandRunEfiDecompress (
             } else {\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
+              if (OutBuffer == NULL || ScratchBuffer == NULL) {\r
+                Status = EFI_OUT_OF_RESOURCES;\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, L"efidecompress", OutFileName, Status);  \r
-                  ShellStatus = SHELL_DEVICE_ERROR;\r
-                }\r
+                Status = Decompress->Decompress (Decompress, InBuffer, (UINT32) InSize, OutBuffer, OutSize, ScratchBuffer, ScratchSize);\r
               }\r
-            } \r
+            }\r
+          }\r
+\r
+          if (EFI_ERROR (Status)) {\r
+            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_EFI_DECOMPRESS_FAIL), gShellDebug1HiiHandle, Status);\r
+            ShellStatus = ((Status == EFI_OUT_OF_RESOURCES) ? SHELL_OUT_OF_RESOURCES : 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, L"efidecompress", OutFileName, Status);\r
+              ShellStatus = SHELL_DEVICE_ERROR;\r
+            }\r
           }\r
         }\r
       }\r