tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
jcarsey 2012-01-02 21:17:20 +00:00
parent 1921657354
commit 8fcf74a850
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Main file for Parse shell level 2 function. Main file for Parse shell level 2 function.
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -91,22 +91,26 @@ PerformParsing(
} }
} }
if (ColumnLoop == ColumnIndex) { if (ColumnLoop == ColumnIndex) {
ASSERT(ColumnPointer != NULL); if (ColumnPointer == NULL) {
TempSpot = StrStr(ColumnPointer, L","); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"Column Index");
if (TempSpot != NULL) { ShellStatus = SHELL_INVALID_PARAMETER;
*TempSpot = CHAR_NULL; } else {
} TempSpot = StrStr(ColumnPointer, L",");
while (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L' '){ if (TempSpot != NULL) {
ColumnPointer++; *TempSpot = CHAR_NULL;
} }
if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L'\"'){ while (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L' '){
ColumnPointer++; ColumnPointer++;
} }
if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[StrLen(ColumnPointer)-1] == L'\"'){ if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L'\"'){
ColumnPointer[StrLen(ColumnPointer)-1] = CHAR_NULL; ColumnPointer++;
} }
if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[StrLen(ColumnPointer)-1] == L'\"'){
ColumnPointer[StrLen(ColumnPointer)-1] = CHAR_NULL;
}
ShellPrintEx(-1, -1, L"%s\r\n", ColumnPointer); ShellPrintEx(-1, -1, L"%s\r\n", ColumnPointer);
}
} }
} }
SHELL_FREE_NON_NULL(TempLine); SHELL_FREE_NON_NULL(TempLine);