ShellPkg/If: 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>

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
index dc96bffde7d3b0ef19459a1c0c87459e3545c993..e4dbe010905955dd28f41245a2e3e51071aaadfe 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
@@ -2,7 +2,7 @@
   Main file for If and else shell level 1 function.\r
 \r
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 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
@@ -42,15 +42,17 @@ typedef enum {
 \r
   @param[in, out] Statement    The current remaining statement.\r
   @param[in] Fragment          The current fragment.\r
+  @param[out] Match            TRUE when there is another Fragment in Statement,\r
+                               FALSE otherwise.\r
 \r
-  @retval FALSE   There is not another fragment.\r
-  @retval TRUE    There is another fragment.\r
+  @retval EFI_SUCCESS          The match operation is performed successfully.\r
+  @retval EFI_OUT_OF_RESOURCES Out of resources.\r
 **/\r
-BOOLEAN\r
-EFIAPI\r
+EFI_STATUS\r
 IsNextFragment (\r
   IN OUT CONST CHAR16     **Statement,\r
-  IN CONST CHAR16         *Fragment\r
+  IN CONST CHAR16         *Fragment,\r
+  OUT BOOLEAN             *Match\r
   )\r
 {\r
   CHAR16                  *Tester;\r
@@ -58,7 +60,9 @@ IsNextFragment (
   Tester = NULL;\r
 \r
   Tester = StrnCatGrow(&Tester, NULL, *Statement, StrLen(Fragment));\r
-  ASSERT(Tester != NULL);\r
+  if (Tester == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
   Tester[StrLen(Fragment)] = CHAR_NULL;\r
   if (gUnicodeCollation->StriColl(\r
         gUnicodeCollation,\r
@@ -71,11 +75,12 @@ IsNextFragment (
     while (*Statement[0] == L' ') {\r
       (*Statement)++;\r
     }\r
-    FreePool(Tester);\r
-    return (TRUE);\r
+    *Match = TRUE;\r
+  } else {\r
+    *Match = FALSE;\r
   }\r
   FreePool(Tester);\r
-  return (FALSE);\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
@@ -365,6 +370,7 @@ ProcessStatement (
   CHAR16                  *Compare2;\r
   CHAR16                  HexString[20];\r
   CHAR16                  *TempSpot;\r
+  BOOLEAN                 Match;\r
 \r
   ASSERT((END_TAG_TYPE)OperatorToUse != EndTagThen);\r
 \r
@@ -372,7 +378,7 @@ ProcessStatement (
   BinOp           = OperatorMax;\r
   OperationResult = FALSE;\r
   StatementWalker = gEfiShellParametersProtocol->Argv[StartParameterNumber];\r
-  if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"not")) {\r
+  if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"not", &Match)) && Match) {\r
     NotPresent      = TRUE;\r
     StatementWalker = gEfiShellParametersProtocol->Argv[++StartParameterNumber];\r
   } else {\r
@@ -382,16 +388,19 @@ ProcessStatement (
   //\r
   // now check for 'boolfunc' operators\r
   //\r
-  if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"isint")) {\r
-    if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && StatementWalker[StrLen(StatementWalker)-1] == L')') {\r
+  if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"isint", &Match)) && Match) {\r
+    if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match\r
+        && StatementWalker[StrLen(StatementWalker)-1] == L')') {\r
       StatementWalker[StrLen(StatementWalker)-1] = CHAR_NULL;\r
       OperationResult = ShellIsHexOrDecimalNumber(StatementWalker, FALSE, FALSE);\r
     } else {\r
       Status = EFI_INVALID_PARAMETER;\r
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_IN), gShellLevel1HiiHandle, L"isint");\r
     }\r
-  } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"exists") || IsNextFragment((CONST CHAR16**)(&StatementWalker), L"exist")) {\r
-    if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && StatementWalker[StrLen(StatementWalker)-1] == L')') {\r
+  } else if ((!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"exists", &Match)) && Match) ||\r
+             (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"exist", &Match)) && Match)) {\r
+    if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match &&\r
+        StatementWalker[StrLen(StatementWalker)-1] == L')') {\r
       StatementWalker[StrLen(StatementWalker)-1] = CHAR_NULL;\r
       //\r
       // is what remains a file in CWD???\r
@@ -403,8 +412,9 @@ ProcessStatement (
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_IN), gShellLevel1HiiHandle, L"exist(s)");\r
       Status = EFI_INVALID_PARAMETER;\r
     }\r
-  } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"available")) {\r
-    if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && StatementWalker[StrLen(StatementWalker)-1] == L')') {\r
+  } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"available", &Match)) && Match) {\r
+    if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match &&\r
+        StatementWalker[StrLen(StatementWalker)-1] == L')') {\r
       StatementWalker[StrLen(StatementWalker)-1] = CHAR_NULL;\r
       //\r
       // is what remains a file in the CWD or path???\r
@@ -414,8 +424,9 @@ ProcessStatement (
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_IN), gShellLevel1HiiHandle, L"available");\r
       Status = EFI_INVALID_PARAMETER;\r
     }\r
-  } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"profile")) {\r
-    if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && StatementWalker[StrLen(StatementWalker)-1] == L')') {\r
+  } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"profile", &Match)) && Match) {\r
+    if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match &&\r
+        StatementWalker[StrLen(StatementWalker)-1] == L')') {\r
       //\r
       // Chop off that ')'\r
       //\r
@@ -440,9 +451,9 @@ ProcessStatement (
     // get the first item\r
     //\r
     StatementWalker = gEfiShellParametersProtocol->Argv[StartParameterNumber];\r
-    if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"efierror")) {\r
+    if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"efierror", &Match)) && Match) {\r
       TempSpot = StrStr(StatementWalker, L")");\r
-      if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && TempSpot != NULL) {\r
+      if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match && TempSpot != NULL) {\r
         *TempSpot = CHAR_NULL;\r
         if (ShellIsHexOrDecimalNumber(StatementWalker, FALSE, FALSE)) {\r
           UnicodeSPrint(HexString, sizeof(HexString), L"0x%x", ShellStrToUintn(StatementWalker)|MAX_BIT);\r
@@ -457,9 +468,9 @@ ProcessStatement (
         ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_IN), gShellLevel1HiiHandle, L"efierror");\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"pierror")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"pierror", &Match)) && Match) {\r
       TempSpot = StrStr(StatementWalker, L")");\r
-      if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && TempSpot != NULL) {\r
+      if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match && TempSpot != NULL) {\r
         *TempSpot = CHAR_NULL;\r
         if (ShellIsHexOrDecimalNumber(StatementWalker, FALSE, FALSE)) {\r
           UnicodeSPrint(HexString, sizeof(HexString), L"0x%x", ShellStrToUintn(StatementWalker)|MAX_BIT|(MAX_BIT>>2));\r
@@ -474,9 +485,9 @@ ProcessStatement (
         ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_IN), gShellLevel1HiiHandle, L"pierror");\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"oemerror")) {\r
+    } else if (!EFI_ERROR (IsNextFragment ((CONST CHAR16**)(&StatementWalker), L"oemerror", &Match)) && Match) {\r
       TempSpot = StrStr(StatementWalker, L")");\r
-      if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && TempSpot != NULL) {\r
+      if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match && TempSpot != NULL) {\r
         TempSpot = CHAR_NULL;\r
         if (ShellIsHexOrDecimalNumber(StatementWalker, FALSE, FALSE)) {\r
           UnicodeSPrint(HexString, sizeof(HexString), L"0x%x", ShellStrToUintn(StatementWalker)|MAX_BIT|(MAX_BIT>>1));\r
@@ -509,27 +520,27 @@ ProcessStatement (
     //\r
     ASSERT(StartParameterNumber+1<EndParameterNumber);\r
     StatementWalker = gEfiShellParametersProtocol->Argv[StartParameterNumber+1];\r
-    if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"gt")) {\r
+    if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"gt", &Match)) && Match) {\r
       BinOp = OperatorGreaterThan;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"lt")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"lt", &Match)) && Match) {\r
       BinOp = OperatorLessThan;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"eq")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"eq", &Match)) && Match) {\r
       BinOp = OperatorEqual;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ne")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ne", &Match)) && Match) {\r
       BinOp = OperatorNotEqual;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ge")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ge", &Match)) && Match) {\r
       BinOp = OperatorGreatorOrEqual;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"le")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"le", &Match)) && Match) {\r
       BinOp = OperatorLessOrEqual;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"==")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"==", &Match)) && Match) {\r
       BinOp = OperatorEqual;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ugt")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ugt", &Match)) && Match) {\r
       BinOp = OperatorUnisgnedGreaterThan;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ult")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ult", &Match)) && Match) {\r
       BinOp = OperatorUnsignedLessThan;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"uge")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"uge", &Match)) && Match) {\r
       BinOp = OperatorUnsignedGreaterOrEqual;\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ule")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ule", &Match)) && Match) {\r
       BinOp = OperatorUnsignedLessOrEqual;\r
     } else {\r
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_INVALID_BINOP), gShellLevel1HiiHandle, StatementWalker);\r
@@ -541,9 +552,9 @@ ProcessStatement (
     //\r
     ASSERT(StartParameterNumber+2<=EndParameterNumber);\r
     StatementWalker = gEfiShellParametersProtocol->Argv[StartParameterNumber+2];\r
-    if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"efierror")) {\r
+    if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"efierror", &Match)) && Match) {\r
       TempSpot = StrStr(StatementWalker, L")");\r
-      if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && TempSpot != NULL) {\r
+      if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match && TempSpot != NULL) {\r
         TempSpot = CHAR_NULL;\r
         if (ShellIsHexOrDecimalNumber(StatementWalker, FALSE, FALSE)) {\r
           UnicodeSPrint(HexString, sizeof(HexString), L"0x%x", ShellStrToUintn(StatementWalker)|MAX_BIT);\r
@@ -561,9 +572,9 @@ ProcessStatement (
     //\r
     // can this be collapsed into the above?\r
     //\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"pierror")) {\r
+    } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"pierror", &Match)) && Match) {\r
       TempSpot = StrStr(StatementWalker, L")");\r
-      if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && TempSpot != NULL) {\r
+      if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match && TempSpot != NULL) {\r
         TempSpot = CHAR_NULL;\r
         if (ShellIsHexOrDecimalNumber(StatementWalker, FALSE, FALSE)) {\r
           UnicodeSPrint(HexString, sizeof(HexString), L"0x%x", ShellStrToUintn(StatementWalker)|MAX_BIT|(MAX_BIT>>2));\r
@@ -578,9 +589,9 @@ ProcessStatement (
         ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_IN), gShellLevel1HiiHandle, L"pierror");\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
-    } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"oemerror")) {\r
+    } else if (!EFI_ERROR (IsNextFragment ((CONST CHAR16**)(&StatementWalker), L"oemerror", &Match)) && Match) {\r
       TempSpot = StrStr(StatementWalker, L")");\r
-      if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(") && TempSpot != NULL) {\r
+      if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"(", &Match)) && Match && TempSpot != NULL) {\r
         TempSpot = CHAR_NULL;\r
         if (ShellIsHexOrDecimalNumber(StatementWalker, FALSE, FALSE)) {\r
           UnicodeSPrint(HexString, sizeof(HexString), L"0x%x", ShellStrToUintn(StatementWalker)|MAX_BIT|(MAX_BIT>>1));\r