- ASSERT(ColumnPointer != NULL);\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
+ 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