From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 49BC082134 for ; Mon, 20 Feb 2017 18:26:36 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP; 20 Feb 2017 18:26:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,187,1484035200"; d="scan'208";a="1113411184" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by fmsmga001.fm.intel.com with ESMTP; 20 Feb 2017 18:26:34 -0800 From: Dandan Bi To: edk2-devel@lists.01.org Cc: Eric Dong , Liming Gao Date: Tue, 21 Feb 2017 10:26:16 +0800 Message-Id: <1487643976-279528-1-git-send-email-dandan.bi@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 Subject: [PATCH v2] MdeModulePkg/HiiDatabase: clean the value before setting default string X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2017 02:26:36 -0000 For string op-code, the default string may not reach the maximum size, so when generating string, we should clean the value before setting the default string. V2: Add check for default string size. Cc: Eric Dong Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi --- MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index d547f42..ccf4b5a 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -1,9 +1,9 @@ /** @file Implementation of interfaces function for EFI_HII_CONFIG_ROUTING_PROTOCOL. -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials 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 http://opensource.org/licenses/bsd-license.php @@ -3579,10 +3579,11 @@ GenerateAltConfigResp ( IFR_DEFAULT_DATA *DefaultId; IFR_DEFAULT_DATA *DefaultValueData; UINTN Width; UINT8 *TmpBuffer; CHAR16 *DefaultString; + UINTN StrSize; BlockData = NULL; DataExist = FALSE; DefaultString = NULL; // @@ -3696,21 +3697,33 @@ GenerateAltConfigResp ( // Convert Value to a hex string in "%x" format // NOTE: This is in the opposite byte that GUID and PATH use // if (BlockData->OpCode == EFI_IFR_STRING_OP){ DefaultString = InternalGetString(HiiHandle, DefaultValueData->Value.string); - TmpBuffer = (UINT8 *) DefaultString; + TmpBuffer = AllocateZeroPool (Width); + ASSERT (TmpBuffer != NULL); + if (DefaultString != NULL) { + StrSize = StrLen(DefaultString)* sizeof (CHAR16); + if (StrSize > Width) { + StrSize = Width; + } + CopyMem (TmpBuffer, (UINT8 *) DefaultString, StrSize); + } } else { TmpBuffer = (UINT8 *) &(DefaultValueData->Value); } for (; Width > 0 && (TmpBuffer != NULL); Width--) { StringPtr += UnicodeValueToString (StringPtr, PREFIX_ZERO | RADIX_HEX, TmpBuffer[Width - 1], 2); } if (DefaultString != NULL){ FreePool(DefaultString); DefaultString = NULL; } + if (BlockData->OpCode == EFI_IFR_STRING_OP && TmpBuffer != NULL) { + FreePool(TmpBuffer); + TmpBuffer = NULL; + } } } } HiiToLower (*DefaultAltCfgResp); -- 1.9.5.msysgit.1