diff options
author | Shumin Qiu <shumin.qiu@intel.com> | 2014-03-07 01:06:37 +0000 |
---|---|---|
committer | shenshushi <shenshushi@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-03-07 01:06:37 +0000 |
commit | 4f344fffc7fb541d11edf4cf657f84549b334244 (patch) | |
tree | 1f947766d7a2a5028e5b6b162d078ab28cdb1e3c /ShellPkg/Library/UefiShellLevel2CommandsLib | |
parent | 7292c69b2ae18cda8cd21f25daff85da1e69a23d (diff) | |
download | edk2-4f344fffc7fb541d11edf4cf657f84549b334244.zip edk2-4f344fffc7fb541d11edf4cf657f84549b334244.tar.gz edk2-4f344fffc7fb541d11edf4cf657f84549b334244.tar.bz2 |
1.Add code to check the pointer 'CorrectedPath' in Ls.c line 460 before referenced. 2.Not use explicit comparisons to TRUE or FALSE for Boolean variable in Ls.c. 3.Add doxygen tags in comment and return type for 'ToLower' in ShellProtocol.c.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Shumin Qiu <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15320 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ShellPkg/Library/UefiShellLevel2CommandsLib')
-rw-r--r-- | ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c index 63af5ea..64ce4ae 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c @@ -437,7 +437,7 @@ PrintLsOutput( }
}
- if (!Sfo && HeaderPrinted == FALSE) {
+ if (!Sfo && !HeaderPrinted) {
PrintNonSfoHeader(CorrectedPath);
}
PrintFileInformation(Sfo, Node, &FileCount, &FileSize, &DirCount);
@@ -457,6 +457,9 @@ PrintLsOutput( ShellCloseFileMetaArg(&ListHead);
CorrectedPath[0] = CHAR_NULL;
CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, RootPath, 0);
+ if (CorrectedPath == NULL) {
+ return SHELL_OUT_OF_RESOURCES;
+ }
if (CorrectedPath[StrLen(CorrectedPath)-1] != L'\\'
&&CorrectedPath[StrLen(CorrectedPath)-1] != L'/') {
CorrectedPath = StrnCatGrow(&CorrectedPath, &LongestPath, L"\\", 0);
@@ -498,7 +501,7 @@ PrintLsOutput( SHELL_FREE_NON_NULL(CorrectedPath);
ShellCloseFileMetaArg(&ListHead);
- if (Found == NULL && FoundOne == FALSE) {
+ if (Found == NULL && !FoundOne) {
return (SHELL_NOT_FOUND);
}
|