From nobody Fri May 3 20:26:58 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 1525779993712442.2126706632431; Tue, 8 May 2018 04:46:33 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 153CC203BBBA4; Tue, 8 May 2018 04:46:32 -0700 (PDT) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 30612207E36CB for ; Tue, 8 May 2018 04:46:30 -0700 (PDT) Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2018 04:46:30 -0700 Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by orsmga008.jf.intel.com with ESMTP; 08 May 2018 04:46:29 -0700 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=134.134.136.31; helo=mga06.intel.com; envelope-from=dandan.bi@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.49,378,1520924400"; d="scan'208";a="39580086" From: Dandan Bi To: edk2-devel@lists.01.org Date: Tue, 8 May 2018 19:46:19 +0800 Message-Id: <20180508114620.78328-1-dandan.bi@intel.com> X-Mailer: git-send-email 2.14.3.windows.1 Subject: [edk2] [patch] BaseTools/VfrCompile: Avoid using uninitialized pointer X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Dong , Liming Gao 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" _CLEAR_SAVED_OPHDR () is used for initialize the variables. We should not update it to free memory. It will cause some pointer used before initialization. This patch is to fix this issue. Cc: Eric Dong Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi Tested-by: Gary Lin --- BaseTools/Source/C/VfrCompile/VfrSyntax.g | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C= /VfrCompile/VfrSyntax.g index 4b0a43606ea..cc042ab4307 100644 --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g @@ -4103,12 +4103,15 @@ vfrStatementExpression [UINT32 RootLevel, UINT32 Ex= pOpCount =3D 0] : } } } =20 if ($RootLevel = =3D=3D 0) { - _CLEAR_SAVED_O= PHDR (); - mCIfrOpHdrInde= x --; + if (mCIfrOpHdr= [mCIfrOpHdrIndex] !=3D NULL) { + delete mCIfr= OpHdr[mCIfrOpHdrIndex]; + mCIfrOpHdr[m= CIfrOpHdrIndex] =3D NULL; + } + mCIfrOpHdrInd= ex --; } >> ; =20 // @@ -5082,14 +5085,11 @@ EfiVfrParser::_SAVE_OPHDR_COND ( VOID EfiVfrParser::_CLEAR_SAVED_OPHDR ( VOID ) { - if (mCIfrOpHdr[mCIfrOpHdrIndex] !=3D NULL) { - delete mCIfrOpHdr[mCIfrOpHdrIndex]; - mCIfrOpHdr[mCIfrOpHdrIndex] =3D NULL; - } + mCIfrOpHdr[mCIfrOpHdrIndex] =3D NULL; mCIfrOpHdrLineNo[mCIfrOpHdrIndex] =3D 0; } =20 BOOLEAN EfiVfrParser::_SET_SAVED_OPHDR_SCOPE ( --=20 2.14.3.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel