ShellPkg: print error when column index is out of range instead of ASSERT.

signed-off-by: jcarsey
reviewed-by: leegrosenbaum

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12904 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
index 1cdc9e32e302dc6e467bdebfdd61da8cbe9455e2..4072b9469d01b961beb010224862c34c55148661 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for Parse shell level 2 function.\r
 \r
 /** @file\r
   Main file for Parse shell level 2 function.\r
 \r

-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2012, 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
   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


@@ -91,22 +91,26 @@ PerformParsing(
             }\r
           }\r
           if (ColumnLoop == ColumnIndex) {\r
             }\r
           }\r
           if (ColumnLoop == ColumnIndex) {\r

-            ASSERT(ColumnPointer != NULL);\r
-            TempSpot = StrStr(ColumnPointer, L",");\r
-            if (TempSpot != NULL) {\r
-              *TempSpot = CHAR_NULL;\r
+            if (ColumnPointer == NULL) {\r
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"Column Index");\r
+              ShellStatus = SHELL_INVALID_PARAMETER;\r
+            } else {\r
+              TempSpot = StrStr(ColumnPointer, L",");\r
+              if (TempSpot != NULL) {\r
+                *TempSpot = CHAR_NULL;\r
+              }\r
+              while (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L' '){\r
+                ColumnPointer++;\r
+              }\r
+              if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L'\"'){\r
+                ColumnPointer++;\r
+              }\r
+              if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[StrLen(ColumnPointer)-1] == L'\"'){\r
+                ColumnPointer[StrLen(ColumnPointer)-1] = CHAR_NULL;\r
+              }\r
+\r
+              ShellPrintEx(-1, -1, L"%s\r\n", ColumnPointer);\r

             }\r
             }\r

-            while (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L' '){\r
-              ColumnPointer++;\r
-            }\r
-            if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L'\"'){\r
-              ColumnPointer++;\r
-            }\r
-            if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[StrLen(ColumnPointer)-1] == L'\"'){\r
-              ColumnPointer[StrLen(ColumnPointer)-1] = CHAR_NULL;\r
-            }\r
-\r
-            ShellPrintEx(-1, -1, L"%s\r\n", ColumnPointer);\r

           }\r
         }\r
         SHELL_FREE_NON_NULL(TempLine);\r
           }\r
         }\r
         SHELL_FREE_NON_NULL(TempLine);\r