* [PATCH] MdePkg/BaseLib: Add an additional check within AsciiStriCmp
@ 2018-08-03 3:40 Ruiyu Ni
2018-08-03 5:08 ` Wu, Hao A
0 siblings, 1 reply; 2+ messages in thread
From: Ruiyu Ni @ 2018-08-03 3:40 UTC (permalink / raw)
To: edk2-devel; +Cc: Hao A Wu
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 <ruiyu.ni@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
---
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.16.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MdePkg/BaseLib: Add an additional check within AsciiStriCmp
2018-08-03 3:40 [PATCH] MdePkg/BaseLib: Add an additional check within AsciiStriCmp Ruiyu Ni
@ 2018-08-03 5:08 ` Wu, Hao A
0 siblings, 0 replies; 2+ messages in thread
From: Wu, Hao A @ 2018-08-03 5:08 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org
Reviewed-by: Hao Wu <Hao.a.wu@intel.com>
Best Regards,
Hao Wu
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ruiyu
> Ni
> Sent: Friday, August 03, 2018 11:41 AM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A
> Subject: [edk2] [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 <ruiyu.ni@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> ---
> 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.16.1.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-03 5:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-03 3:40 [PATCH] MdePkg/BaseLib: Add an additional check within AsciiStriCmp Ruiyu Ni
2018-08-03 5:08 ` Wu, Hao A
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox