sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdePkg/BaseLib: Refine (Ascii)StrnLenS functions logic

Browse Source 
This commit refines the logic for AsciiStrnLenS and StrnLenS. It makes the
logic more straightforward to prevent possible mis-reports by static code
checkers.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Hao Wu 2016-11-15 09:59:37 +08:00
parent d0c80b8a2d
commit c07c517cc5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MdePkg/Library/BaseLib/SafeString.c
View File

@ -143,8 +143,12 @@ StrnLenS (
// String then StrnLenS returns MaxSize. At most the first MaxSize characters of String shall // String then StrnLenS returns MaxSize. At most the first MaxSize characters of String shall
// be accessed by StrnLenS. // be accessed by StrnLenS.
// //
for (Length = 0; (Length < MaxSize) && (*String != 0); String++, Length++) { Length = 0;
; while (String[Length] != 0) {
if (Length >= MaxSize - 1) {
return MaxSize;
}
Length++;
} }
return Length; return Length;
} }
@ -571,8 +575,12 @@ AsciiStrnLenS (
// String then AsciiStrnLenS returns MaxSize. At most the first MaxSize characters of String shall // String then AsciiStrnLenS returns MaxSize. At most the first MaxSize characters of String shall
// be accessed by AsciiStrnLenS. // be accessed by AsciiStrnLenS.
// //
for (Length = 0; (Length < MaxSize) && (*String != 0); String++, Length++) { Length = 0;
; while (String[Length] != 0) {
if (Length >= MaxSize - 1) {
return MaxSize;
}
Length++;
} }
return Length; return Length;
} }