From nobody Sun May 5 00:58:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58683+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58683+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=intel.com Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588740954647625.7708894729165; Tue, 5 May 2020 21:55:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id d6RkYY1788612xl1P6b5rKDt; Tue, 05 May 2020 21:55:54 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.846.1588740953498661615 for ; Tue, 05 May 2020 21:55:53 -0700 IronPort-SDR: vnoYO+9YK4PzByUFDqEdVJpTX4xOovEkQpWtzuB46Szope8ILPXd4NYBX1rZFcIindHN+b4x3R KCWwgfoBgFlQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2020 21:55:50 -0700 IronPort-SDR: 6J6/lo90uf6IX0Vdu8xjS+gmjeWB6viwz9FJcHxIPY8rb2UYjzQKhwC4E97TFS1KSfpxKQ8wiK kZpfved4misw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,357,1583222400"; d="scan'208";a="249665570" X-Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by fmsmga007.fm.intel.com with ESMTP; 05 May 2020 21:55:50 -0700 X-Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX103.amr.corp.intel.com (10.22.225.130) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 5 May 2020 21:55:50 -0700 X-Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 May 2020 21:55:49 -0700 X-Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 5 May 2020 21:55:49 -0700 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.106) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 5 May 2020 21:55:49 -0700 X-Received: from BN8PR11MB3793.namprd11.prod.outlook.com (2603:10b6:408:86::23) by BN8PR11MB3682.namprd11.prod.outlook.com (2603:10b6:408:88::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.27; Wed, 6 May 2020 04:55:48 +0000 X-Received: from BN8PR11MB3793.namprd11.prod.outlook.com ([fe80::6455:7f80:a3b2:730b]) by BN8PR11MB3793.namprd11.prod.outlook.com ([fe80::6455:7f80:a3b2:730b%5]) with mapi id 15.20.2958.030; Wed, 6 May 2020 04:55:48 +0000 From: "Feng, YunhuaX" To: "devel@edk2.groups.io" CC: "Feng, Bob C" , "Gao, Liming" Subject: [edk2-devel] [PATCH] BaseTools: Fix parse GUID expression issue Thread-Topic: [PATCH] BaseTools: Fix parse GUID expression issue Thread-Index: AdYjYpczf3UzTv12SHO7B7rgwgfCOQ== Date: Wed, 6 May 2020 04:55:47 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.102.204.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 970d34e2-804f-46be-7e0f-08d7f179be3a x-ms-traffictypediagnostic: BN8PR11MB3682: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:576; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: +nCO5+nXl43Nzb1bmcI3+fR3ePfFQ2Z5/cH8P3nFaJLTDMJ/+DVSvpxjOWQly4X3kygUrTaEAIIUD+/kPtB7Ez9rFgdjZhLifdq3BJmM1HQjEwJ1lGLxfdyMNHWEal2BEazHb34q+snjAeP3iQ9rY4ihDGXPxXKCedfBOp42TZ5kuy7awTK3R4bQSR/kdCJvqEZrbOBwBVw+SfiR8YQY+KgPkbm2BN1y1tFGGvuMQ/eUAZpxUFyH/Kg18eh/DFL+4qsyUz6UmNxKdF/0VLdvNjOHBRr5D9dfY15kBYe6BsPAGQ4YcrAlU0WGHdqNu9mw/BPRNVJfryS+SLJo9V4MZmfzrKxatx+YJSx1Ajs5qaRZUFQTMm/ZyaW/Q9jJ9ziFPvWBCF0+BBPS2uFdWY57Ble+GmkO4q+BJ1OjXXG7r7rSjQNW1/oOKp7sSYSTXVVYOgkOewKBr1z5QvyDrezPMFI4H6iRecAl0W0XN6f77LqvlFmQYCpF+XmL/umvt9W3u+EO67kNL4c00XvDmP9W3OWs+TAMxCBXvLDWEpsJLNRJfuqgOtwng9wKom7z7k7YTlT2qq3eHky9WBscnpAzDEhyHHJZPR/PwrULWEKuAVw= x-ms-exchange-antispam-messagedata: CbWoAE+PRf+5irnQAkZcDD+EWibKotudfYiXHr08mbCLe4c1i68HvV0tND3pxYX8wnO8YIhCo1h2pWfZ9O7EsspJHQNvJ1DPkfLTn0PfKBHeBPumWBFkN5xCxo5TUp8OvrfYDsmizKKbRN837dmxsmKHq9KZGAdbA6HHbNQ/hosoWtMsv+0ZRYjBpRrUa23qOV489LVSN/BeJS+i46pVN0xwVSLq9+/xKrgc+mY31DCzksojyGGorbJmRgFOVBUjw58fZyLL0210xmTkD2AIvoAjbW5Q4QHva3fjPtygBy2w5TV4xqoczgkC07AWUblhiRjBB6S1fo6LRaIiX4wnEnxFXUjCjjUVM4C6ShvK9lg47ISb3v/SJ0ko50RwC91LY0w1vGItoe3e8qHx+KgzD3F5Bjdw2OBnk9sUa2R+wjLkCHEQuYBoYTZ4FRzTVuZcq+PGyrTosuHyo/3c6dvRO124E/J+uB+HEbBHswk6ChQEVYxEORJp6cGlyc56aiak4eFYQzTIJtFqFe7RrDzdZeE67uwTmO7S3AtVUzCzALPnVs9xX4togkvovdWsd58nMnb33UIjFMBn4klZL/xST3sb77pll3dXFYLFQS/2Sxzuu5BSgoNXPKKOlLNNfNlCdOqM7D3QtiIDvIj2TY/uqWVxHpKN2L0ZC8nKSQOijjCoHFAqPOyqpPnTcJ9LuXKY1k1ruZCbOTStNbgx6oyjgui3oAEaW5aKqVN4LVyu3rD2WgBT73FlxLDkSbGBhWLIC4/6noLBnWPUnAuhY3olbmi79pvrEIdPzMflHs24yN4= arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jdw2cLPda8rHNNF/gQC4HX/YOcXUVmUkdhAUGgIC2qtENXaRkoiC2c3lRxGY+WV2WkDtAL7tYvwdaz2J8w2Iw1LTwEDN2Al4n+sn+obBFixXpqP7zEXEj+IEINtBb/D9HzNBIXPEjSOSrzJt81BOAvBSsQktP8y3JYteX8xhq7qVrJAbVijbWn1G1VLoXZQ6H4h+Lve3f+RjuCEc+qM1AGSj6dO6N93yph57vzbjU5amFAEWKXK6eW+aJSM+Ap0l6Zv6PzHPTmGhse8o5E8stsq+rkIt7Cz2fTvr20ubx3OD1wfEoryv1eHap2tYPh8hlfPUHWXrKWKMtuP3D9CijQ== arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WbsdcPeoDxcYP6DdXPx1I9Ia+kp37HlX1PgQKyICQLE=; b=APSB8aTXxK7rzOIitfz9Cwp2spMjwvR9GXvuyt5iv6rR9nqy/FIcgpGWwgl2HXXMNoXe9EEWNbh7JMYGO8Zje6gtOyLeZOnYl/rGZEsfrSqboGb4gSBzo0+DRhYxfO7ASw5ANoFV0djmWqQawEaGav3bwnSr8TVCMq7Ye4Qf3W/dYCAaXZhBf4MyV0w0LYNxucEdUdsVPyMxGrHxgQ4OlTGrELjd3vaazANs+osEcvg8J8SHz/Q0H+p7LPhTqloYKHEL3qA1GZtZ7bR4RsGLqFpvA9KsQvGn7lTFJGlCq61QpYFD3OFtXAxJe+KCSz/U4G38luoVH2pB2ArHPqeXvQ== arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none x-ms-exchange-crosstenant-network-message-id: 970d34e2-804f-46be-7e0f-08d7f179be3a x-ms-exchange-crosstenant-originalarrivaltime: 06 May 2020 04:55:47.9276 (UTC) x-ms-exchange-crosstenant-fromentityheader: Hosted x-ms-exchange-crosstenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d x-ms-exchange-crosstenant-mailboxtype: HOSTED x-ms-exchange-crosstenant-userprincipalname: VMOgnG6xT8hszKCHcMC1UZlJ/QKh/zR0JTYgtZfajgO0ezcN+UZO5nTcLRuRO9rIX/v6qOsxqqVcgcSPDDQDDw== x-ms-exchange-transport-crosstenantheadersstamped: BN8PR11MB3682 MIME-Version: 1.0 X-OriginatorOrg: intel.com Precedence: Bulk List-Unsubscribe: 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,yunhuax.feng@intel.com X-Gm-Message-State: TaA3DQ5XWyAxgN1FN055Gvk3x1787277AA= Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588740954; bh=bdqaGpJsaSomGuNRkrdMADoaZTEn8hl6v+fyC703V5g=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=glVqTXaTa6QorejJWyTWkWq5EnJHAtp9gceVJFlwnpOxxam6fHOHiFCMb52umEX7swU X+doCBdU/nEKHRuduWsbYSkfHCej0rPZfS8hmEcNrchHu22TkbAZvbgA+mOxj0HwV4o9K TyiiYGPNJ9M2m//7QkfkiR+61hAwaF3wmnY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2686 some GUID include character ' or " ascii value, transfer to string will catch the wrong value. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Yunhua Feng --- BaseTools/Source/Python/Common/Misc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index da5fb380f0..ad55671080 100755 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -37,10 +37,11 @@ from Common.LongFilePathSupport import OpenLongFilePath= as open from Common.LongFilePathSupport import CopyLongFilePath as CopyLong from Common.LongFilePathSupport import LongFilePath as LongFilePath from Common.MultipleWorkspace import MultipleWorkspace as mws from CommonDataClass.Exceptions import BadExpression from Common.caching import cached_property +import struct ArrayIndex =3D re.compile("\[\s*[0-9a-fA-FxX]*\s*\]") ## Regular expression used to find out place holders in string template gPlaceholderPattern =3D re.compile("\$\{([^$()\s]+)\}", re.MULTILINE | re.= UNICODE) @@ -1153,17 +1154,16 @@ def ParseFieldValue (Value): raise BadExpression("Invalid GUID value string %s" % Value) Value =3D TmpValue if Value[0] =3D=3D '"' and Value[-1] =3D=3D '"': Value =3D Value[1:-1] try: - Value =3D str(uuid.UUID(Value).bytes_le) - if Value.startswith("b'"): - Value =3D Value[2:-1] - Value =3D "'" + Value + "'" + Value =3D uuid.UUID(Value).bytes_le + ValueL, ValueH =3D struct.unpack('2Q', Value) + Value =3D (ValueH << 64 ) | ValueL + except ValueError as Message: raise BadExpression(Message) - Value, Size =3D ParseFieldValue(Value) return Value, 16 if Value.startswith('L"') and Value.endswith('"'): # Unicode String # translate escape character Value =3D Value[1:] -- 2.12.2.windows.2 -=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 (#58683): https://edk2.groups.io/g/devel/message/58683 Mute This Topic: https://groups.io/mt/74023220/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-