From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 48F0B2119A46C for ; Sun, 9 Dec 2018 16:18:46 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Dec 2018 16:18:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,336,1539673200"; d="scan'208";a="302404260" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga005.fm.intel.com with ESMTP; 09 Dec 2018 16:18:45 -0800 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 9 Dec 2018 16:18:45 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 9 Dec 2018 16:18:44 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.203]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.201]) with mapi id 14.03.0415.000; Mon, 10 Dec 2018 08:18:42 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fixed bugs in CopyDict function Thread-Index: AQHUj8VNvYx9omTDik28njX6aDucvKV3HBAg Date: Mon, 10 Dec 2018 00:18:41 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E388EA9@SHSMSX104.ccr.corp.intel.com> References: <20181209134413.11868-1-bob.c.feng@intel.com> In-Reply-To: <20181209134413.11868-1-bob.c.feng@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 Subject: Re: [Patch] BaseTools: Fixed bugs in CopyDict function X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2018 00:18:46 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Bob: This is a failure caused by the recent patch. Please list which commit ca= use this issue.=20 Thanks Liming >-----Original Message----- >From: Feng, Bob C >Sent: Sunday, December 09, 2018 9:44 PM >To: edk2-devel@lists.01.org >Cc: Feng, Bob C ; Gao, Liming >Subject: [Patch] BaseTools: Fixed bugs in CopyDict function > >https://bugzilla.tianocore.org/show_bug.cgi?id=3D1387 >Remove the CopyDict incorrect usage for non-dict input data. >Add a check for CopyDict input > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >--- > BaseTools/Source/Python/Common/Misc.py | 2 ++ > BaseTools/Source/Python/Workspace/DscBuildData.py | 4 ++-- > 2 files changed, 4 insertions(+), 2 deletions(-) > >diff --git a/BaseTools/Source/Python/Common/Misc.py >b/BaseTools/Source/Python/Common/Misc.py >index b063f064fb..6a22d01012 100644 >--- a/BaseTools/Source/Python/Common/Misc.py >+++ b/BaseTools/Source/Python/Common/Misc.py >@@ -2137,10 +2137,12 @@ def PackByteFormatGUID(Guid): > # > # @retval new dict or orderdict > # > def CopyDict(ori_dict): > dict_type =3D ori_dict.__class__ >+ if dict_type not in (dict,OrderedDict): >+ return ori_dict > new_dict =3D dict_type() > for key in ori_dict: > if isinstance(ori_dict[key],(dict,OrderedDict)): > new_dict[key] =3D CopyDict(ori_dict[key]) > else: >diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py >b/BaseTools/Source/Python/Workspace/DscBuildData.py >index b485c75a84..4543ae7dc0 100644 >--- a/BaseTools/Source/Python/Workspace/DscBuildData.py >+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py >@@ -972,11 +972,11 @@ class DscBuildData(PlatformBuildClassObject): > for skuid in pcd.SkuInfoList: > skuobj =3D pcd.SkuInfoList.get(skuid) > if TAB_DEFAULT_STORES_DEFAULT not in skuobj.DefaultStoreD= ict: > PcdDefaultStoreSet =3D set(defaultstorename for defa= ultstorename >in skuobj.DefaultStoreDict) > mindefaultstorename =3D >DefaultStoreMgr.GetMin(PcdDefaultStoreSet) >- skuobj.DefaultStoreDict[TAB_DEFAULT_STORES_DEFAULT] = =3D >CopyDict(skuobj.DefaultStoreDict[mindefaultstorename]) >+ skuobj.DefaultStoreDict[TAB_DEFAULT_STORES_DEFAULT] = =3D >skuobj.DefaultStoreDict[mindefaultstorename] > return Pcds > > def RecoverCommandLinePcd(self): > def UpdateCommandLineValue(pcd): > if pcd.Type in >[self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], >@@ -2767,11 +2767,11 @@ class DscBuildData(PlatformBuildClassObject): > for skuid in PcdObj.SkuInfoList: > skuobj =3D PcdObj.SkuInfoList[skuid] > mindefaultstorename =3D >DefaultStoreObj.GetMin(set(defaultstorename for defaultstorename in >skuobj.DefaultStoreDict)) > for defaultstorename in DefaultStores: > if defaultstorename not in skuobj.DefaultStoreDic= t: >- skuobj.DefaultStoreDict[defaultstorename] =3D >CopyDict(skuobj.DefaultStoreDict[mindefaultstorename]) >+ skuobj.DefaultStoreDict[defaultstorename] =3D >skuobj.DefaultStoreDict[mindefaultstorename] > skuobj.HiiDefaultValue =3D >skuobj.DefaultStoreDict[mindefaultstorename] > for skuname, skuid in SkuIds.items(): > if skuname not in PcdObj.SkuInfoList: > nextskuid =3D self.SkuIdMgr.GetNextSkuId(skuname) > while nextskuid not in PcdObj.SkuInfoList: >-- >2.18.0.windows.1