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

MdePkg/BasePrintLib: Fix incomplete print output 

This is caused by previous patch which tried to fix string over-read,
which breaks UEFI menu rendering: the following

/------------------------------------------------------------------------------\
|                               Device Manager                                 |
\------------------------------------------------------------------------------/

is rendered as

/\
|                               Device Manager                                 |
\/.0                                                 2.00 GHz

(the spurious digits are SMBIOS data from the home screen)

The problem appears to be that the CHAR16 value of BOXDRAW_HORIZONTAL
equals 0x2500, which means that testing ArgumentString[] != '\0'
(which tests the low byte only) will yield FALSE and terminate the
loop prematurely.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Wang, Jian J 2018-01-02 16:20:20 +08:00 committed by Liming Gao
parent cd16355bbf
commit 701e8cc29a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MdePkg/Library/BasePrintLib/PrintLibInternal.c
View File

@ -1108,7 +1108,9 @@ BasePrintLibSPrintMarker (
// ArgumentString is either null-terminated, or it contains Precision characters
//
for (Count = 0;
ArgumentString[Count * BytesPerArgumentCharacter] != '\0' &&
(ArgumentString[Count * BytesPerArgumentCharacter] != '\0' ||
(BytesPerArgumentCharacter > 1 &&
ArgumentString[Count * BytesPerArgumentCharacter + 1]!= '\0')) &&
(Count < Precision || ((Flags & PRECISION) == 0));
Count++) {
ArgumentCharacter = ((ArgumentString[Count * BytesPerArgumentCharacter] & 0xff) | ((ArgumentString[Count * BytesPerArgumentCharacter + 1]) << 8)) & ArgumentMask;
@ -1167,7 +1169,9 @@ BasePrintLibSPrintMarker (
//
// Copy the string into the output buffer performing the required type conversions
//
while (Index < Count && (*ArgumentString) != '\0') {
while (Index < Count &&
(ArgumentString[0] != '\0' ||
(BytesPerArgumentCharacter > 1 && ArgumentString[1] != '\0'))) {
ArgumentCharacter = ((*ArgumentString & 0xff) | (((UINT8)*(ArgumentString + 1)) << 8)) & ArgumentMask;
LengthToReturn += (1 * BytesPerOutputCharacter);