From 753a18f965cb9cd9e48d376a6c71823548eeb3a0 Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Wed, 7 Dec 2016 10:39:03 +0800 Subject: [PATCH] MdePkg/BaseLib: Add an additional check within (Ascii)StrnCmp This commit adds an addtional check in AsciiStrnCmp and StrnCmp. 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.0 Signed-off-by: Hao Wu Reviewed-by: Michael Kinney --- MdePkg/Library/BaseLib/String.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c index 25962f85b2..fa96d1c1ee 100644 --- a/MdePkg/Library/BaseLib/String.c +++ b/MdePkg/Library/BaseLib/String.c @@ -1,7 +1,7 @@ /** @file Unicode and ASCII string primitives. - Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
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 @@ -315,6 +315,7 @@ StrnCmp ( } while ((*FirstString != L'\0') && + (*SecondString != L'\0') && (*FirstString == *SecondString) && (Length > 1)) { FirstString++; @@ -1474,6 +1475,7 @@ AsciiStrnCmp ( } while ((*FirstString != '\0') && + (*SecondString != '\0') && (*FirstString == *SecondString) && (Length > 1)) { FirstString++;