commit 2efafabf41f05b88c421d97838f193eeb3f9c8e2
author Ruiyu Ni <ruiyu.ni@intel.com> Wed Jul 13 17:39:37 2016 +0800
committer Ruiyu Ni <ruiyu.ni@intel.com> Mon Jul 18 11:04:10 2016 +0800
tree 356224d9b63bb7eb6d558e6396941ed0e21f0770
parent 28d447f9bdbc79317be60064521f81e04d72c063

ShellPkg/UefiShellLib: Handle memory allocation failure

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

ShellPkg/Library/UefiShellLib/UefiShellLib.c

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index 5e5e627..e4e7e3d 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -2021,6 +2021,7 @@
   UINTN                         Count;

   CONST CHAR16                  *TempPointer;

   UINTN                         CurrentValueSize;

+  CHAR16                        *NewValue;

 

   CurrentItemPackage = NULL;

   GetItemValue = 0;

@@ -2119,8 +2120,15 @@
       // get the item VALUE for a previous flag

       //

       CurrentValueSize = ValueSize + StrSize(Argv[LoopCounter]) + sizeof(CHAR16);

-      CurrentItemPackage->Value = ReallocatePool(ValueSize, CurrentValueSize, CurrentItemPackage->Value);

-      ASSERT(CurrentItemPackage->Value != NULL);

+      NewValue = ReallocatePool(ValueSize, CurrentValueSize, CurrentItemPackage->Value);

+      if (NewValue == NULL) {

+        SHELL_FREE_NON_NULL (CurrentItemPackage->Value);

+        SHELL_FREE_NON_NULL (CurrentItemPackage);

+        ShellCommandLineFreeVarList (*CheckPackage);

+        *CheckPackage = NULL;

+        return EFI_OUT_OF_RESOURCES;

+      }

+      CurrentItemPackage->Value = NewValue;

       if (ValueSize == 0) {

         StrCpyS( CurrentItemPackage->Value, 

                   CurrentValueSize/sizeof(CHAR16),