From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=jian.j.wang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AB27B222EDCF7 for ; Tue, 2 Jan 2018 00:15:34 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jan 2018 00:20:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,495,1508828400"; d="scan'208";a="6802847" Received: from jwang36-mobl2.ccr.corp.intel.com ([10.239.192.34]) by fmsmga008.fm.intel.com with ESMTP; 02 Jan 2018 00:20:35 -0800 From: Jian J Wang To: edk2-devel@lists.01.org Cc: Michael D Kinney , Liming Gao , Star Zeng , Ard Biesheuvel Date: Tue, 2 Jan 2018 16:20:20 +0800 Message-Id: <20180102082021.17792-2-jian.j.wang@intel.com> X-Mailer: git-send-email 2.15.1.windows.2 In-Reply-To: <20180102082021.17792-1-jian.j.wang@intel.com> References: <20180102082021.17792-1-jian.j.wang@intel.com> Subject: [PATCH 1/2] MdePkg/BasePrintLib: Fix incomplete print output X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jan 2018 08:15:35 -0000 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 Cc: Liming Gao Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdePkg/Library/BasePrintLib/PrintLibInternal.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c index fc57255068..6f19b31449 100644 --- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c +++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c @@ -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); -- 2.15.1.windows.2