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.120; helo=mga04.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 5E54122280C29 for ; Tue, 26 Dec 2017 20:58:49 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Dec 2017 21:03:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,462,1508828400"; d="scan'208";a="5113725" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga002.fm.intel.com with ESMTP; 26 Dec 2017 21:03:44 -0800 Received: from fmsmsx121.amr.corp.intel.com (10.18.125.36) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 26 Dec 2017 21:03:44 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx121.amr.corp.intel.com (10.18.125.36) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 26 Dec 2017 21:03:43 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.213]) with mapi id 14.03.0319.002; Wed, 27 Dec 2017 13:03:42 +0800 From: "Zeng, Star" To: "Gao, Liming" , "edk2-devel@lists.01.org" CC: "Zeng, Star" Thread-Topic: [Patch] MdeModulePkg HiiDataBase: Fix the potential NULL pointer reference Thread-Index: AQHTfrrL6GWuv4lw+Em4CIsg2KDigqNWomSQ Date: Wed, 27 Dec 2017 05:03:41 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B9DDCBE@SHSMSX104.ccr.corp.intel.com> References: <1514341879-10544-1-git-send-email-liming.gao@intel.com> In-Reply-To: <1514341879-10544-1-git-send-email-liming.gao@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] MdeModulePkg HiiDataBase: Fix the potential NULL pointer reference 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: Wed, 27 Dec 2017 04:58:49 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Could you add more information about this patch between 14b351e2ed8586f144d= d3cd2e0a25082c1a32837? With that, Reviewed-by: Star Zeng Thanks, Star -----Original Message----- From: Gao, Liming=20 Sent: Wednesday, December 27, 2017 10:31 AM To: edk2-devel@lists.01.org Cc: Zeng, Star Subject: [Patch] MdeModulePkg HiiDataBase: Fix the potential NULL pointer r= eference Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Star Zeng --- MdeModulePkg/Universal/HiiDatabaseDxe/Database.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePk= g/Universal/HiiDatabaseDxe/Database.c index c10134b8e6..e062094f79 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c @@ -845,7 +845,7 @@ UpdateDefaultSettingInFormPackage ( // EfiVarStoreList =3D ReallocatePool (EfiVarStoreMaxNum * sizeof (= UINTN), (EfiVarStoreMaxNum + BASE_NUMBER) * sizeof (UINTN), EfiVarStoreList= ); if (EfiVarStoreList =3D=3D NULL) { - break; + goto Done; } EfiVarStoreMaxNum =3D EfiVarStoreMaxNum + BASE_NUMBER; } @@ -874,7 +874,7 @@ UpdateDefaultSettingInFormPackage ( // DefaultIdList =3D ReallocatePool (DefaultIdMaxNum * sizeof (UINT= 16), (DefaultIdMaxNum + BASE_NUMBER) * sizeof (UINT16), DefaultIdList); if (DefaultIdList =3D=3D NULL) { - break; + goto Done; } DefaultIdMaxNum =3D DefaultIdMaxNum + BASE_NUMBER; } @@ -1046,8 +1046,10 @@ UpdateDefaultSettingInFormPackage ( } =20 Done: - for (Index =3D 0; Index < EfiVarStoreNumber; Index ++) { - FreePool (EfiVarStoreList [Index]); + if (EfiVarStoreList !=3D NULL) {=20 + for (Index =3D 0; Index < EfiVarStoreNumber; Index ++) { + FreePool (EfiVarStoreList [Index]); + } } return; } --=20 2.11.0.windows.1