tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use TmpStr as a backup, as StrCpy in BaseLib does not handle copy of two strings

Browse Source 
that overlap.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5559 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2008-07-23 12:45:44 +00:00
parent 40f26b8f44
commit 11c11e4ecf
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
View File

@ -1080,6 +1080,7 @@ BOpt_AppendFileName (
UINTN Size1; UINTN Size1;
UINTN Size2; UINTN Size2;
CHAR16 *Str; CHAR16 *Str;
CHAR16 *TmpStr;
CHAR16 *Ptr; CHAR16 *Ptr;
CHAR16 *LastSlash; CHAR16 *LastSlash;
@ -1088,6 +1089,9 @@ BOpt_AppendFileName (
Str = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16)); Str = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));
ASSERT (Str != NULL); ASSERT (Str != NULL);
TmpStr = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));
ASSERT (TmpStr != NULL);
StrCat (Str, Str1); StrCat (Str, Str1);
if (!((*Str == '\\') && (*(Str + 1) == 0))) { if (!((*Str == '\\') && (*(Str + 1) == 0))) {
StrCat (Str, L"\\"); StrCat (Str, L"\\");
@ -1104,13 +1108,25 @@ BOpt_AppendFileName (
// DO NOT convert the .. if it is at the end of the string. This will // DO NOT convert the .. if it is at the end of the string. This will
// break the .. behavior in changing directories. // break the .. behavior in changing directories.
// //
StrCpy (LastSlash, Ptr + 3);
//
// Use TmpStr as a backup, as StrCpy in BaseLib does not handle copy of two strings
// that overlap.
//
StrCpy (TmpStr, Ptr + 3);
StrCpy (LastSlash, TmpStr);
Ptr = LastSlash; Ptr = LastSlash;
} else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') { } else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {
// //
// Convert a "\.\" to a "\" // Convert a "\.\" to a "\"
// //
StrCpy (Ptr, Ptr + 2);
//
// Use TmpStr as a backup, as StrCpy in BaseLib does not handle copy of two strings
// that overlap.
//
StrCpy (TmpStr, Ptr + 2);
StrCpy (Ptr, TmpStr);
Ptr = LastSlash; Ptr = LastSlash;
} else if (*Ptr == '\\') { } else if (*Ptr == '\\') {
LastSlash = Ptr; LastSlash = Ptr;
@ -1119,6 +1135,8 @@ BOpt_AppendFileName (
Ptr++; Ptr++;
} }
FreePool (TmpStr);
return Str; return Str;
} }