From nobody Sun May 5 00:19:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1514277379776590.7042696040171; Tue, 26 Dec 2017 00:36:19 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 68357222F4E09; Tue, 26 Dec 2017 00:31:22 -0800 (PST) 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 3904A222CB332 for ; Tue, 26 Dec 2017 00:31:20 -0800 (PST) Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Dec 2017 00:36:14 -0800 Received: from shwde7172.ccr.corp.intel.com ([10.239.9.15]) by fmsmga008.fm.intel.com with ESMTP; 26 Dec 2017 00:36:13 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,459,1508828400"; d="scan'208";a="5294103" From: Liming Gao To: edk2-devel@lists.01.org Date: Tue, 26 Dec 2017 16:36:11 +0800 Message-Id: <1514277371-11760-1-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 Subject: [edk2] [Patch] MdeModulePkg HiiDataBaseDxe: Add the check for the memory allocation return 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: , Cc: Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Star Zeng Reviewed-by: Star Zeng --- MdeModulePkg/Universal/HiiDatabaseDxe/Database.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePk= g/Universal/HiiDatabaseDxe/Database.c index 7441c19..c10134b 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c @@ -844,6 +844,9 @@ UpdateDefaultSettingInFormPackage ( // Reallocate EFI VarStore Buffer // EfiVarStoreList =3D ReallocatePool (EfiVarStoreMaxNum * sizeof (= UINTN), (EfiVarStoreMaxNum + BASE_NUMBER) * sizeof (UINTN), EfiVarStoreList= ); + if (EfiVarStoreList =3D=3D NULL) { + break; + } EfiVarStoreMaxNum =3D EfiVarStoreMaxNum + BASE_NUMBER; } IfrEfiVarStore =3D (EFI_IFR_VARSTORE_EFI *) IfrOpHdr; @@ -851,6 +854,9 @@ UpdateDefaultSettingInFormPackage ( // Convert VarStore Name from ASCII string to Unicode string. // EfiVarStoreList [EfiVarStoreNumber] =3D AllocatePool (IfrEfiVarStore= ->Header.Length + AsciiStrSize ((CHAR8 *)IfrEfiVarStore->Name)); + if (EfiVarStoreList [EfiVarStoreNumber] =3D=3D NULL) { + break; + } CopyMem (EfiVarStoreList [EfiVarStoreNumber], IfrEfiVarStore, IfrEfi= VarStore->Header.Length); AsciiStrToUnicodeStrS ((CHAR8 *)IfrEfiVarStore->Name, (CHAR16 *) &(E= fiVarStoreList [EfiVarStoreNumber]->Name[0]), AsciiStrSize ((CHAR8 *)IfrEfi= VarStore->Name) * sizeof (CHAR16)); Status =3D FindQuestionDefaultSetting (EFI_HII_DEFAULT_CLASS_STANDAR= D, EfiVarStoreList[EfiVarStoreNumber], &VarStoreQuestionHeader, NULL, IfrEf= iVarStore->Size, FALSE); @@ -867,6 +873,9 @@ UpdateDefaultSettingInFormPackage ( // Reallocate DefaultIdNumber // DefaultIdList =3D ReallocatePool (DefaultIdMaxNum * sizeof (UINT= 16), (DefaultIdMaxNum + BASE_NUMBER) * sizeof (UINT16), DefaultIdList); + if (DefaultIdList =3D=3D NULL) { + break; + } DefaultIdMaxNum =3D DefaultIdMaxNum + BASE_NUMBER; } DefaultIdList[DefaultIdNumber ++] =3D ((EFI_IFR_DEFAULTSTORE *) IfrO= pHdr)->DefaultId; --=20 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel