From nobody Thu May 16 19:10:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+75553+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+75553+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1621923638; cv=none; d=zohomail.com; s=zohoarc; b=hYApqG4WKCb5SD0FCQk187aQWfKpR2LuOQ/6cV8i8eB9qMvFV/BXaSS/V5aodGnCpuN9IIazO0tUT9EN/ZOW1nUv9nZ4S9CEGPzaxxr/wq7+STmwn0OTSagWwBxBmhCI9/1gV8A10gaaluItRSFzXk2q3I6YjeSDg+5ovx91URk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621923638; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=thv5UA39kAOSqULsIxHDv3zmLPwGfJTELpxnAYDXhUI=; b=VuNsqRU2FF1fdtacMQowDn0yQkqqQ+/Lp3EQ4el/VRUoDkxj7wBEe1/2KDfxVeq0bqsORc1T92JEs5i86ELfdcmouj23CPAQPnwKF84e3FYNvOkTN3DGErZBsfdYGW8Iy/ETju81+WiVoPqDJtMht4QKwaamWux+c5xs+HEN9NQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+75553+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1621923637998550.0724905735564; Mon, 24 May 2021 23:20:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id IllcYY1788612xnZamAGXpdO; Mon, 24 May 2021 23:20:37 -0700 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.5979.1621923636525893997 for ; Mon, 24 May 2021 23:20:36 -0700 IronPort-SDR: HPC+5P8EU8eiCSecuHpKaRh194N+XcJZQ/Vy1NQDfv/SXXNuncKCCoDltrklI5I46YGWTvsq8M PLtT90rU+qxQ== X-IronPort-AV: E=McAfee;i="6200,9189,9994"; a="266010486" X-IronPort-AV: E=Sophos;i="5.82,327,1613462400"; d="scan'208";a="266010486" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2021 23:20:34 -0700 IronPort-SDR: mFqU0Ui3F/RQNh0XTi3zSA11gUkuLETzieYtdSMn2XK41DPPskojQcEWuy4T9TTMauEUE+VO2E Xfwj6bcUBYRQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,327,1613462400"; d="scan'208";a="479141371" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.137]) by fmsmga002.fm.intel.com with ESMTP; 24 May 2021 23:20:33 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Liming Gao , Yuwei Chen Subject: [edk2-devel] [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is no fv ext_header Date: Tue, 25 May 2021 14:20:26 +0800 Message-Id: <20210525062026.1258-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bob.c.feng@intel.com X-Gm-Message-State: jyU3NOFj9u6ovBi9QbkDixXzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621923637; bh=uUf6+JdM7t8kvPuasCAgftv/35ybhbLuX0HOQnlZ0ns=; h=Cc:Date:From:Reply-To:Subject:To; b=K3+Aa/R3RGwkySfiUfBimMfrXaFr99SGt7wcn6KyMiuQi4Xa+P+cWv+yFY5ai7eWwTP AsvQgssfofJeIMN7ufRYViOYYsci2UvIUNF8HCkwopvvN+x8bbIf5aYXajHwdabMN8PEo LHu8GpMkAyHXvyGf4YX9AKkE6qPf40l73tQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" FMMT will crash if there is no fv ext_header in a specific FV. This patch is going to add a check point for this case. Signed-off-by: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Reviewed-by: Liming Gao Reviewed-by: Yuwei Chen --- BaseTools/Source/C/FMMT/FmmtLib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c b/BaseTools/Source/C/FMMT/Fm= mtLib.c index fa77ed7317..4f6056edba 100644 --- a/BaseTools/Source/C/FMMT/FmmtLib.c +++ b/BaseTools/Source/C/FMMT/FmmtLib.c @@ -4544,16 +4544,18 @@ LibEncapNewFvFile( if (CurrentEncapData !=3D NULL) { LocalEncapData =3D CurrentEncapData; while (LocalEncapData->Level !=3D ParentLevel) { LocalEncapData =3D LocalEncapData->NextNode; } + if (LocalEncapData->FvExtHeader !=3DNULL) { for (Index =3D 0; Index <=3D FvInFd->FfsNumbers; Index++) { if ((memcmp(&FvInFd->FfsAttuibutes[Index].GuidName, &(Loca= lEncapData->FvExtHeader->FvName), sizeof(EFI_GUID)) =3D=3D 0)) { SubFvId =3D Index; break; } } + } } // // Found FFSs from Fv structure. // FfsFoundFlag =3D FALSE; --=20 2.29.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#75553): https://edk2.groups.io/g/devel/message/75553 Mute This Topic: https://groups.io/mt/83070312/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-