From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.3592.1571301716085782495 for ; Thu, 17 Oct 2019 01:41:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: dandan.bi@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Oct 2019 01:41:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,307,1566889200"; d="scan'208";a="396188681" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga005.fm.intel.com with ESMTP; 17 Oct 2019 01:41:52 -0700 Received: from fmsmsx154.amr.corp.intel.com (10.18.116.70) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 17 Oct 2019 01:41:52 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX154.amr.corp.intel.com (10.18.116.70) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 17 Oct 2019 01:41:52 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.166]) by SHSMSX152.ccr.corp.intel.com ([10.239.6.52]) with mapi id 14.03.0439.000; Thu, 17 Oct 2019 16:41:50 +0800 From: "Dandan Bi" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Dong, Eric" Subject: Re: [PATCH 2/4] MdeModulePkg/HiiDatabaseDxe: Add check for StringPtr Thread-Topic: [PATCH 2/4] MdeModulePkg/HiiDatabaseDxe: Add check for StringPtr Thread-Index: AQHVhJtYtDPwekrnUUWgJu4/N2sYpadegdQg Date: Thu, 17 Oct 2019 08:41:50 +0000 Message-ID: <3C0D5C461C9E904E8F62152F6274C0BB40C7A1B9@SHSMSX104.ccr.corp.intel.com> References: <20191017033110.12128-1-shenglei.zhang@intel.com> <20191017033110.12128-3-shenglei.zhang@intel.com> In-Reply-To: <20191017033110.12128-3-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: dandan.bi@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: Zhang, Shenglei > Sent: Thursday, October 17, 2019 11:31 AM > To: devel@edk2.groups.io > Cc: Bi, Dandan ; Dong, Eric > Subject: [PATCH 2/4] MdeModulePkg/HiiDatabaseDxe: Add check for > StringPtr >=20 > If the target string doesn't appear in the searched string, StringPtr wil= l be > NULL. So add a check for that. >=20 > Cc: Dandan Bi > Cc: Eric Dong > Signed-off-by: Shenglei Zhang > --- > MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c > b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c > index 71ea25bc19bf..f786da8e370a 100644 > --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c > +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c > @@ -909,6 +909,10 @@ CompareAndMergeDefaultString ( > // To find the with AltConfigHdr in AltCfgResp, ignore other > which follow it. > // > StringPtr =3D StrStr (*AltCfgResp, AltConfigHdr); > + if (StringPtr =3D=3D NULL) { > + Status =3D EFI_NOT_FOUND; > + goto Exit; > + } Hi Shenglei, I think we can add ASSERT (StringPtr !=3D NULL); here. Since when call this function, the AltCfgResp and DefaultAltCfgResp must ha= ve contained the AltConfigHdr. The caller of the CompareAndMergeDefaultString have done the check. Thanks, Dandan > StringPtrNext =3D StrStr (StringPtr + 1, L"&GUID"); > if (StringPtrNext !=3D NULL) { > TempCharA =3D *StringPtrNext; > -- > 2.18.0.windows.1