tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allocate temp buffer instead of change the input string to avoid crush. 

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14040 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2013-01-08 08:30:51 +00:00
parent 685e44a546
commit 8b5b3d421f
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MdePkg/Library/UefiLib/Console.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
This module provide help function for displaying unicode string. This module provide help function for displaying unicode string.
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -332,8 +332,9 @@ UefiLibGetStringWidth (
// //
// Advance to the null-terminator or to the first width directive // Advance to the null-terminator or to the first width directive
// //
for (;(String[Index] != NARROW_CHAR) && (String[Index] != WIDE_CHAR) && (String[Index] != 0); for (;(String[Index] != NARROW_CHAR) && (String[Index] != WIDE_CHAR) && (String[Index] != 0); Index++) {
Index++, Count = Count + IncrementValue) { Count = Count + IncrementValue;
if (LimitLen && Count > MaxWidth) { if (LimitLen && Count > MaxWidth) {
break; break;
} }
@ -347,7 +348,7 @@ UefiLibGetStringWidth (
} }
if (LimitLen && Count > MaxWidth) { if (LimitLen && Count > MaxWidth) {
*Offset = Index - 1; *Offset = Index;
break; break;
} }
@ -370,13 +371,6 @@ UefiLibGetStringWidth (
} }
} while (String[Index] != 0); } while (String[Index] != 0);
//
// Increment by one to include the null-terminator in the size
//
if (!LimitLen) {
Count++;
}
return Count * sizeof (CHAR16); return Count * sizeof (CHAR16);
} }
@ -420,6 +414,7 @@ CreatePopUp (
UINTN Length; UINTN Length;
CHAR16 *Line; CHAR16 *Line;
UINTN EventIndex; UINTN EventIndex;
CHAR16 *TmpString;
// //
// Determine the length of the longest line in the popup and the the total // Determine the length of the longest line in the popup and the the total
@ -520,10 +515,14 @@ CreatePopUp (
// Length > MaxLength // Length > MaxLength
// //
UefiLibGetStringWidth (String, TRUE, MaxLength, &Length); UefiLibGetStringWidth (String, TRUE, MaxLength, &Length);
String[Length] = L'\0'; TmpString = AllocateZeroPool ((Length + 1) * sizeof (CHAR16));
ASSERT (TmpString != NULL);
StrnCpy(TmpString, String, Length - 3);
StrCat (TmpString, L"...");
ConOut->SetCursorPosition (ConOut, Column + 1, Row++); ConOut->SetCursorPosition (ConOut, Column + 1, Row++);
ConOut->OutputString (ConOut, String); ConOut->OutputString (ConOut, TmpString);
FreePool (TmpString);
} }
NumberOfLines--; NumberOfLines--;
} }