In 'For.c' return error status instead of a wrong number when fail to convert a
string to UINT64.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.car...@intel.com>
Reviewed-by: Qiu Shumin <shumin....@intel.com>
---
ShellPkg/Library/UefiShellLevel1CommandsLib/For.c | 53 ++++++++---------------
1 file changed, 18 insertions(+), 35 deletions(-)
diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
index 2ecc5cd..3a6852e 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
@@ -2,7 +2,7 @@
Main file for endfor and for shell level 1 functions.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
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
@@ -255,29 +255,6 @@ InternalRemoveAliasFromList(
}
/**
- Function to determine whether a string is decimal or hex representation of a
number
- and return the number converted from the string.
-
- @param[in] String String representation of a number
-
- @return the number
- @retval (UINTN)(-1) An error ocurred.
-**/
-UINTN
-EFIAPI
-ReturnUintn(
- IN CONST CHAR16 *String
- )
-{
- UINT64 RetVal;
-
- if (!EFI_ERROR(ShellConvertStringToUint64(String, &RetVal, FALSE, TRUE))) {
- return ((UINTN)RetVal);
- }
- return ((UINTN)(-1));
-}
-
-/**
Function for 'for' command.
@param[in] ImageHandle Handle to the Image (NULL if Internal).
@@ -305,6 +282,7 @@ ShellCommandRunFor (
EFI_SHELL_FILE_INFO *Node;
EFI_SHELL_FILE_INFO *FileList;
UINTN NewSize;
+ UINT64 Temp;
ArgSet = NULL;
ArgSize = 0;
@@ -509,15 +487,17 @@ ShellCommandRunFor (
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
if (ArgSetWalker[0] == L'-') {
- Info->Current = 0 - (INTN)ReturnUintn(ArgSetWalker+1);
+ Status = ShellConvertStringToUint64(ArgSetWalker+1, &Temp,
FALSE, TRUE);
+ Info->Current = 0 - (INTN)Temp;
} else {
- Info->Current = (INTN)ReturnUintn(ArgSetWalker);
+ Status = ShellConvertStringToUint64(ArgSetWalker, &Temp,
FALSE, TRUE);
+ Info->Current = (INTN)Temp;
}
ArgSetWalker = StrStr(ArgSetWalker, L" ");
while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {
ArgSetWalker++;
}
- if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL ||
!ShellIsValidForNumber(ArgSetWalker)){
+ if (EFI_ERROR(Status) || ArgSetWalker == NULL || *ArgSetWalker
== CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){
ShellPrintHiiEx(
-1,
-1,
@@ -529,9 +509,11 @@ ShellCommandRunFor (
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
if (ArgSetWalker[0] == L'-') {
- Info->End = 0 - (INTN)ReturnUintn(ArgSetWalker+1);
+ Status = ShellConvertStringToUint64(ArgSetWalker+1, &Temp,
FALSE, TRUE);
+ Info->End = 0 - (INTN)Temp;
} else {
- Info->End = (INTN)ReturnUintn(ArgSetWalker);
+ Status = ShellConvertStringToUint64(ArgSetWalker, &Temp,
FALSE, TRUE);
+ Info->End = (INTN)Temp;
}
if (Info->Current < Info->End) {
Info->Step = 1;
@@ -543,8 +525,8 @@ ShellCommandRunFor (
while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {
ArgSetWalker++;
}
- if (ArgSetWalker != NULL && *ArgSetWalker != CHAR_NULL) {
- if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL ||
!ShellIsValidForNumber(ArgSetWalker)){
+ if (EFI_ERROR(Status) || ArgSetWalker != NULL && *ArgSetWalker
!= CHAR_NULL) {
+ if (EFI_ERROR(Status) || ArgSetWalker == NULL ||
*ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){
ShellPrintHiiEx(
-1,
-1,
@@ -559,12 +541,13 @@ ShellCommandRunFor (
ASSERT(Info->Step == 1 || Info->Step == -1);
} else {
if (ArgSetWalker[0] == L'-') {
- Info->Step = 0 - (INTN)ReturnUintn(ArgSetWalker+1);
+ Status = ShellConvertStringToUint64(ArgSetWalker+1,
&Temp, FALSE, TRUE);
+ Info->Step = 0 - (INTN)Temp;
} else {
- Info->Step = (INTN)ReturnUintn(ArgSetWalker);
+ Status = ShellConvertStringToUint64(ArgSetWalker,
&Temp, FALSE, TRUE);
+ Info->Step = (INTN)Temp;
}
-
- if (StrStr(ArgSetWalker, L" ") != NULL) {
+ if (EFI_ERROR(Status) || StrStr(ArgSetWalker, L" ") !=
NULL) {
ShellPrintHiiEx(
-1,
-1,
--
1.9.5.msysgit.1
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
