Revision: 19029
http://sourceforge.net/p/edk2/code/19029
Author: dandanbi
Date: 2015-11-30 07:26:07 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
MdeModulePkg:Replace unsafe string function with safe one.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <[email protected]>
Reviewed-by: Eric Dong <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
Modified: trunk/edk2/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
===================================================================
--- trunk/edk2/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
2015-11-30 03:43:25 UTC (rev 19028)
+++ trunk/edk2/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
2015-11-30 07:26:07 UTC (rev 19029)
@@ -1,7 +1,7 @@
/** @file
File explorer related functions.
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
This software and associated documentation (if any) is furnished
under a license and may only be used or copied in accordance
with the terms of the license. Except as permitted by such
@@ -608,6 +608,7 @@
{
UINTN Size1;
UINTN Size2;
+ UINTN MaxLen;
CHAR16 *Str;
CHAR16 *TmpStr;
CHAR16 *Ptr;
@@ -615,18 +616,19 @@
Size1 = StrSize (Str1);
Size2 = StrSize (Str2);
+ MaxLen = (Size1 + Size2 + sizeof (CHAR16))/ sizeof (CHAR16);
Str = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));
ASSERT (Str != NULL);
TmpStr = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));
ASSERT (TmpStr != NULL);
- StrCat (Str, Str1);
+ StrCpyS (Str, MaxLen, Str1);
if (!((*Str == '\\') && (*(Str + 1) == 0))) {
- StrCat (Str, L"\\");
+ StrCatS (Str, MaxLen, L"\\");
}
- StrCat (Str, Str2);
+ StrCatS (Str, MaxLen, Str2);
Ptr = Str;
LastSlash = Str;
@@ -639,11 +641,11 @@
//
//
- // Use TmpStr as a backup, as StrCpy in BaseLib does not handle copy of
two strings
+ // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of
two strings
// that overlap.
//
- StrCpy (TmpStr, Ptr + 3);
- StrCpy (LastSlash, TmpStr);
+ StrCpyS (TmpStr, MaxLen, Ptr + 3);
+ StrCpyS (LastSlash, MaxLen - (UINTN) (LastSlash - Str), TmpStr);
Ptr = LastSlash;
} else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {
//
@@ -651,11 +653,11 @@
//
//
- // Use TmpStr as a backup, as StrCpy in BaseLib does not handle copy of
two strings
+ // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of
two strings
// that overlap.
//
- StrCpy (TmpStr, Ptr + 2);
- StrCpy (Ptr, TmpStr);
+ StrCpyS (TmpStr, MaxLen, Ptr + 2);
+ StrCpyS (Ptr, MaxLen - (UINTN) (Ptr - Str), TmpStr);
Ptr = LastSlash;
} else if (*Ptr == '\\') {
LastSlash = Ptr;
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
