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

ShellPkg: Refine code to make catenae length more precise. 

This commit refine the catenae length. A too long catenae length in StrnCat may cause potential buffer overflow while in StrnCatS it may ASSERT.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <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@17747 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Qiu Shumin 2015-06-30 20:15:15 +00:00 committed by shenshushi
parent 269e0aebcf
commit 6956ecfe1e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ShellPkg/Application/Shell/FileHandleWrappers.c
View File

@ -516,11 +516,11 @@ FileInterfaceStdInRead(
StrnCatS( TabStr, StrnCatS( TabStr,
(*BufferSize)/sizeof(CHAR16), (*BufferSize)/sizeof(CHAR16),
CurrentString + TabPos, CurrentString + TabPos,
(StringLen - TabPos) * sizeof (CHAR16) StringLen - TabPos
); );
} else { } else {
*TabStr = CHAR_NULL; *TabStr = CHAR_NULL;
StrnCatS(TabStr, (*BufferSize)/sizeof(CHAR16), CurrentString + TabPos, (StringLen - TabPos) * sizeof (CHAR16)); StrnCatS(TabStr, (*BufferSize)/sizeof(CHAR16), CurrentString + TabPos, StringLen - TabPos);
} }
} else { } else {
StrCpyS(TabStr, (*BufferSize)/sizeof(CHAR16), CurrentString + TabPos); StrCpyS(TabStr, (*BufferSize)/sizeof(CHAR16), CurrentString + TabPos);