From c1f032cd3a95ed74dad27d848526495e5790d4af Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Fri, 3 Aug 2018 10:42:45 +0800 Subject: [PATCH] MdePkg/BaseLib: Add an additional check within AsciiStriCmp This commit adds an addtional check in AsciiStriCmp. It explicitly checks the end of the sting pointed by 'SecondString' to make the code logic easier for reading and to prevent possible mis-reports by static code checkers. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Reviewed-by: Hao Wu --- MdePkg/Library/BaseLib/String.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c index e7fe513aec..cb90774c86 100644 --- a/MdePkg/Library/BaseLib/String.c +++ b/MdePkg/Library/BaseLib/String.c @@ -1262,7 +1262,7 @@ AsciiStriCmp ( UpperFirstString = InternalBaseLibAsciiToUpper (*FirstString); UpperSecondString = InternalBaseLibAsciiToUpper (*SecondString); - while ((*FirstString != '\0') && (UpperFirstString == UpperSecondString)) { + while ((*FirstString != '\0') && (*SecondString != '\0') && (UpperFirstString == UpperSecondString)) { FirstString++; SecondString++; UpperFirstString = InternalBaseLibAsciiToUpper (*FirstString); -- 2.39.2