From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id AD1F77803D8 for ; Fri, 13 Oct 2023 16:56:00 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Tr6nnUoUVOAeBG1z1DJ32m4mEtXC8kXAM6IqGFDcwm0=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1697216159; v=1; b=r9YBausnnJSB47TWT67/AYkSyxGl1Y1H6CDs4VVUdGWw35cbA6l+v9c/JRM2MZhOkvwQAmoB +UcZr8oCqVSVar0s+gXgFtQeovGHYhALe5fCPRq937ecRkIVeWto5UTlPPg4nl7jzJTdaajyuVs RIYQlERoiN1lDDVk2tX8l6Do= X-Received: by 127.0.0.2 with SMTP id OTMsYY7687511xawKAJE50Pj; Fri, 13 Oct 2023 09:55:59 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.43991.1697216158814166275 for ; Fri, 13 Oct 2023 09:55:58 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10862"; a="449413979" X-IronPort-AV: E=Sophos;i="6.03,222,1694761200"; d="scan'208";a="449413979" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2023 09:54:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10862"; a="928487573" X-IronPort-AV: E=Sophos;i="6.03,222,1694761200"; d="scan'208";a="928487573" X-Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 13 Oct 2023 09:54:41 -0700 X-Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Fri, 13 Oct 2023 09:54:40 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Fri, 13 Oct 2023 09:54:40 -0700 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32 via Frontend Transport; Fri, 13 Oct 2023 09:54:40 -0700 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.100) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.32; Fri, 13 Oct 2023 09:54:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jjcVePmYOuPF2T7wpOw/CpkjGtAojYia9PGuOKTTimDXXhnI4ylNSpSIPhPpu3yCe+L8Tjaj7vqnTP5/6jSFhYpTJZPdVrQ4xYTuCEl89sjedj3Y2lGCtXZGhQvnEeRpXOKqs1A9el02YU77w9Qk0S1kH7KLBShhMMwfli2xdRsu+37TGtsue1W6QkNhHoHc0/ys3zg91cZZRlPMb2yyoIwOMkt6ci28XDUlKWp6Lp3ZHzhpzGyc8LBwxlScx8OyBYr8Oe0352wUz5riA/xpoQKxNPXIKoJCd+B4CUzWmCMdBZN9Ih7tw5vR17yEV2PanM78xtsRnOutz/G24B+JbA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h9eb0AODGe1cGojh+UarHL02h0X6+TiaWDdE5G0+1tU=; b=GPaKdXZDQh1Te4DhrTttI60da5INjHwi1bJFJPh83wBuRWqI21vwF8jbcchCCweztK40JZwGFMrqJy5qoDXv44+Xc2V76LI13lfe0PZcVPoFolFrgSbabNat6FhFWEhH7x0oXxtjD4UuFIvM0AF5FE1nafbiMvoezh4V94KzrY7LCT/cYkktJXeaDtTMiQtxPPcSBlX2JFGPR3RvXYgInGI062zdMzN8pZTYQKwNLzu7l9M+T9XdH+rCDJ2Ow3wT3zlBZqdguLyq/6J13JHVghcXwLhlhGNJySDYRXfxVu6Al6fLMBG8Id9kVYE2gFS4V/54XJ4es+VWsyCBHJjUew== 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-Received: from CO1PR11MB4929.namprd11.prod.outlook.com (2603:10b6:303:6d::19) by PH7PR11MB5766.namprd11.prod.outlook.com (2603:10b6:510:130::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.44; Fri, 13 Oct 2023 16:54:35 +0000 X-Received: from CO1PR11MB4929.namprd11.prod.outlook.com ([fe80::2ebf:3b09:b169:ee2c]) by CO1PR11MB4929.namprd11.prod.outlook.com ([fe80::2ebf:3b09:b169:ee2c%4]) with mapi id 15.20.6863.043; Fri, 13 Oct 2023 16:54:35 +0000 From: "Michael D Kinney" To: "Albecki, Mateusz" , "devel@edk2.groups.io" CC: "Gao, Liming" , "Liu, Zhiguang" , "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCHv2 1/2] MdePkg/UefiDevicePathLib: Fix AcpiEx print logic Thread-Topic: [PATCHv2 1/2] MdePkg/UefiDevicePathLib: Fix AcpiEx print logic Thread-Index: AQHZ8VqKWaWGKVmuYkyjVZaUKvdderBICNCA Date: Fri, 13 Oct 2023 16:54:35 +0000 Message-ID: References: <20230927155123.1465365-1-mateusz.albecki@intel.com> <20230927155123.1465365-2-mateusz.albecki@intel.com> In-Reply-To: <20230927155123.1465365-2-mateusz.albecki@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CO1PR11MB4929:EE_|PH7PR11MB5766:EE_ x-ms-office365-filtering-correlation-id: 93c19d85-228f-4ac4-e553-08dbcc0d1488 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: NGS14GxuSU0+AWDvLg48FgWyx2CFJPjBGXLpwyX5PY3PTQpNILGYASFLtl95wwW1hs0S3l4HTT4uwl0/ZkPt98tKgd5S3sihtukAykDuUrtmqF1KKg67NgUlVUM5KXSx0L+SPYX91jpfCM8Cl3PtYu0t/BgQX8S3A+ZMC4Fqoy2tuH1ChvO0JVvXdJm1OmKrmGaqn1AfyDjQWhnq+sbik6EfSobxPVAEMgptE1gnw5FYferoT8TjsNjuZyhRnpER7O8EAikcf8KscGN70k1fKU5q2BxZ3VQRbCVSqhBq1ooQFI/saVXANIlqhyWBk//o4YJatYerTbpMNXJu971djhytpL4EdEAeomCW9w6enGxIibFPOBaZCilZauVwQPlKmMAMFWk8yCHkTCflRDrIiO3ABIV++dt7UR8yw2Hn4e+WOQB5O2hbuw4Sy7VCaCby9FRxAqFaVBzJslZHt39DCT0Tkm8UU15PzBTDqifpG/S3kKZBjM5CtQXwvlys4JwDyLz4h19bZLmYWquLA+BFmluqUP/Wka9LrileoPvYrCgHiIeuVyAqD35+moCxIYCCFOFmi+/jO0FB7MXxR/pVWNM9r/VwPxCGuACCX2Bdmtw= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?XWWGahY9T9NK2FiGbEuzOBTrp6inzYsbZWK75RlqH6wsbli2sS7gehwlOVTO?= =?us-ascii?Q?qN+KUGpwBqpFPe9C4DmPkxO8gtQzWG+5forftK9jTR4JqoCBH9CjKJz+YIne?= =?us-ascii?Q?4Tq1dxn4GhJHtQLSdsDAPD+Cgj++uAY5ol+s7nwPo9S18L5qZhFoPXhQcrdH?= =?us-ascii?Q?aGwvttveK1bRU2DkMVwh75WWJi9duxewMVgw0lptZvtRRky9urkxvvgOo45L?= =?us-ascii?Q?DNr3ioDyi1VCIIkWZgJZZ2EPrfhVUZbj3RSC87gf4sUIWz0I7oWdE0X2wvzR?= =?us-ascii?Q?J8822prW3vjJGNrxFy4WSkPznMW4i+GA0YH4SIUy9r9HIfs+BkdhqAvBrLHg?= =?us-ascii?Q?V8m64Uo3lRBxVA8R6Fx5QjU08oitJqT60/+g1ra8BtQ5JODSMfKzVJxc9xR+?= =?us-ascii?Q?U5vZEsjjuBmC9aO19Ub0HU36jHbrAfboEuV1hRSktlVdgPlUfz1NjUgO3l++?= =?us-ascii?Q?DPf+S7wT2S7RYWdsJoBHst5BBhDOLXuCL+fcm+zNNMDLdfr9JduC1WzzJNVp?= =?us-ascii?Q?bsq65Krno4JbgQ+tmvShzkkzbpiushzuqt7ztIwvIUr0LC4bz4H3m+1+wvAU?= =?us-ascii?Q?4TbQDcBrbJexWUGZq9vRUALpHlTGn0pIrZUoPUZCKRQKmzLTNKjN8mh5yMDw?= =?us-ascii?Q?m76HCqfqx33v0h8eb6A5ocylHRLkJ/SYzJlEGUNeje3DA4t6u/k0SHKyaxLo?= =?us-ascii?Q?KXk1bHeb9U1HXviU0TCHA9mLwz0vdDp/mSJhSXMgTwgNtEWvhFY2Rb2GWJAE?= =?us-ascii?Q?ZAu2DDBaV841j04WuAIl95VlzogL41w9hs5MO+TxJpKkI7ko5zWqjaOJhqdy?= =?us-ascii?Q?NlZAcfkRr4E0D3l+FuCAjFlgLVk1n7ZYPYZv9GWVks6SkeXpsMZirlxk+c5b?= =?us-ascii?Q?bYnvvvi4jN509WdQA6qC/U2ys3J/+f06T4sTOFiOfDnhk37ss6weSJnIiC1D?= =?us-ascii?Q?zvLoyFWnH03KbzaoH1k18xzoPqW1hEeAYzBNP/rIBRGDzCJb/jpqHoXW4aLE?= =?us-ascii?Q?+VP5oJ2w6JoetTQt+xHilmTKA7hL/hgqaF1TgGZnh0vb8z4h9/PpG4sOLi8s?= =?us-ascii?Q?W6jPwI711vVkI61DIVDMXGLEb3MbuCSTiOvEPZHBA16yCtvmc1TTzNYu29F6?= =?us-ascii?Q?Cd8qcsR2FBKBkExPh++iiNM0YNlPC0hmru+y2WdKRfAoAIFSP9cKcxg7NMxA?= =?us-ascii?Q?ekaR08Biwo0/psfWbpPrb3HII3qnFmFQ/DSDZA5Fc6Eb/b03qLs9Ruk8IKXQ?= =?us-ascii?Q?MdNZrC5scrDwDCiPQ6s2MqstCwx165w8dVsoFJkwIr9sTMHWV9MmJVocPT/2?= =?us-ascii?Q?QsxVtgZ2Ywga8vgtwGrqapsrqvDswd2AOBq9Ym/eh62sNk2bPWEPM37NSjr4?= =?us-ascii?Q?hWQvnhnkIMRfVpj5svIm+TM90V/buCrqPRYUx1LUrxveqBZbJeHtQ779oYOD?= =?us-ascii?Q?xvWiQ4qxGk65wgieoR9G0lTOO/CtIXm7NArK3EufgiYwY0vLdB7VdfYyuUjN?= =?us-ascii?Q?lK48bEXaP8+rakelpylPxeHgjTfOp/trxuw/3gOIdD/ipgC0eC4c7lFZZLJZ?= =?us-ascii?Q?cHNBjmpuvpDcMQaqbbXqeUN1ziqz9hkxRSeF9nq15NnXUdegLdbh4wv270co?= =?us-ascii?Q?jg=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4929.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93c19d85-228f-4ac4-e553-08dbcc0d1488 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2023 16:54:35.3947 (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: fm6tmrQPUwPdWnnKPRvbvcME+Tm9KTgdukKkS94m7ZBFshdX5q8GYrhbKz0fjXljErS9vQ9wSpQ9LvmhvVn3aY3Kx5lPFKO7V9zbyrehHJw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB5766 X-OriginatorOrg: intel.com Precedence: Bulk 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,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: W3abYvrgjNonEKeDmCSib1gkx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=r9YBausn; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io One comment below. With that fix, Reviewed-by: Michael D Kinney Mike > -----Original Message----- > From: Albecki, Mateusz > Sent: Wednesday, September 27, 2023 8:51 AM > To: devel@edk2.groups.io > Cc: Albecki, Mateusz ; Kinney, Michael D > ; Gao, Liming ; > Liu, Zhiguang > Subject: [PATCHv2 1/2] MdePkg/UefiDevicePathLib: Fix AcpiEx print > logic >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4555 >=20 >=20 >=20 > Add logic that checks if the code doesn't overflow >=20 > ACPI_EXTENDED_HID_DEVICE_PATH node when searching for optional >=20 > strings. If the string is not provided in the device path node >=20 > default value of "\0" is used. >=20 >=20 >=20 > Cc: Michael D Kinney >=20 > Cc: Liming Gao >=20 > Cc: Zhiguang Liu >=20 >=20 >=20 > Signed-off-by: Mateusz Albecki >=20 > --- >=20 > .../UefiDevicePathLib/DevicePathToText.c | 69 +++++++++++------- > - >=20 > 1 file changed, 42 insertions(+), 27 deletions(-) >=20 >=20 >=20 > diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c > b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c >=20 > index dd90dfa58e..bd8d1de201 100644 >=20 > --- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c >=20 > +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c >=20 > @@ -418,23 +418,38 @@ DevPathToTextAcpiEx ( >=20 > ) >=20 > { >=20 > ACPI_EXTENDED_HID_DEVICE_PATH *AcpiEx; >=20 > - CHAR8 *HIDStr; >=20 > - CHAR8 *UIDStr; >=20 > - CHAR8 *CIDStr; >=20 > CHAR16 HIDText[11]; >=20 > CHAR16 CIDText[11]; >=20 > - >=20 > - AcpiEx =3D DevPath; >=20 > - HIDStr =3D (CHAR8 *)(((UINT8 *)AcpiEx) + sizeof > (ACPI_EXTENDED_HID_DEVICE_PATH)); >=20 > - UIDStr =3D HIDStr + AsciiStrLen (HIDStr) + 1; >=20 > - CIDStr =3D UIDStr + AsciiStrLen (UIDStr) + 1; >=20 > + UINTN CurrentLength; >=20 > + CHAR8 *CurrentPos; >=20 > + UINTN NextStringOffset; >=20 > + CHAR8 *Strings[3]; >=20 > + CONST UINT8 HidStrIndex =3D 0; >=20 > + CONST UINT8 UidStrIndex =3D 1; >=20 > + CONST UINT8 CidStrIndex =3D 2; Locals should not be assigned to valued in declaration. Please move value = assignments down. >=20 > + UINT8 StrIndex; >=20 > + >=20 > + AcpiEx =3D DevPath; >=20 > + Strings[HidStrIndex] =3D NULL; >=20 > + Strings[UidStrIndex] =3D NULL; >=20 > + Strings[CidStrIndex] =3D NULL; >=20 > + CurrentLength =3D sizeof (ACPI_EXTENDED_HID_DEVICE_PATH); >=20 > + CurrentPos =3D (CHAR8 *)(((UINT8 *)AcpiEx) + sizeof > (ACPI_EXTENDED_HID_DEVICE_PATH)); >=20 > + StrIndex =3D 0; >=20 > + while (CurrentLength < AcpiEx->Header.Length[0] && StrIndex < > ARRAY_SIZE (Strings)) { >=20 > + Strings[StrIndex] =3D CurrentPos; >=20 > + NextStringOffset =3D AsciiStrLen (CurrentPos) + 1; >=20 > + CurrentLength +=3D NextStringOffset; >=20 > + CurrentPos +=3D NextStringOffset; >=20 > + StrIndex++; >=20 > + } >=20 >=20 >=20 > if (DisplayOnly) { >=20 > if ((EISA_ID_TO_NUM (AcpiEx->HID) =3D=3D 0x0A03) || >=20 > ((EISA_ID_TO_NUM (AcpiEx->CID) =3D=3D 0x0A03) && (EISA_ID_TO_NUM > (AcpiEx->HID) !=3D 0x0A08))) >=20 > { >=20 > - if (AcpiEx->UID =3D=3D 0) { >=20 > - UefiDevicePathLibCatPrint (Str, L"PciRoot(%a)", UIDStr); >=20 > + if (Strings[UidStrIndex] !=3D NULL) { >=20 > + UefiDevicePathLibCatPrint (Str, L"PciRoot(%a)", > Strings[UidStrIndex]); >=20 > } else { >=20 > UefiDevicePathLibCatPrint (Str, L"PciRoot(0x%x)", AcpiEx- > >UID); >=20 > } >=20 > @@ -443,8 +458,8 @@ DevPathToTextAcpiEx ( >=20 > } >=20 >=20 >=20 > if ((EISA_ID_TO_NUM (AcpiEx->HID) =3D=3D 0x0A08) || (EISA_ID_TO_NUM > (AcpiEx->CID) =3D=3D 0x0A08)) { >=20 > - if (AcpiEx->UID =3D=3D 0) { >=20 > - UefiDevicePathLibCatPrint (Str, L"PcieRoot(%a)", UIDStr); >=20 > + if (Strings[UidStrIndex] !=3D NULL) { >=20 > + UefiDevicePathLibCatPrint (Str, L"PcieRoot(%a)", > Strings[UidStrIndex]); >=20 > } else { >=20 > UefiDevicePathLibCatPrint (Str, L"PcieRoot(0x%x)", AcpiEx- > >UID); >=20 > } >=20 > @@ -475,7 +490,10 @@ DevPathToTextAcpiEx ( >=20 > (AcpiEx->CID >> 16) & 0xFFFF >=20 > ); >=20 >=20 >=20 > - if ((*HIDStr =3D=3D '\0') && (*CIDStr =3D=3D '\0') && (*UIDStr !=3D '\= 0')) { >=20 > + if (((Strings[HidStrIndex] !=3D NULL) && (*Strings[HidStrIndex] =3D=3D > '\0')) && >=20 > + ((Strings[CidStrIndex] !=3D NULL) && (*Strings[CidStrIndex] =3D=3D > '\0')) && >=20 > + ((Strings[UidStrIndex] !=3D NULL) && (*Strings[UidStrIndex] !=3D > '\0'))) >=20 > + { >=20 > // >=20 > // use AcpiExp() >=20 > // >=20 > @@ -484,7 +502,7 @@ DevPathToTextAcpiEx ( >=20 > Str, >=20 > L"AcpiExp(%s,0,%a)", >=20 > HIDText, >=20 > - UIDStr >=20 > + Strings[UidStrIndex] >=20 > ); >=20 > } else { >=20 > UefiDevicePathLibCatPrint ( >=20 > @@ -492,28 +510,25 @@ DevPathToTextAcpiEx ( >=20 > L"AcpiExp(%s,%s,%a)", >=20 > HIDText, >=20 > CIDText, >=20 > - UIDStr >=20 > + Strings[UidStrIndex] >=20 > ); >=20 > } >=20 > } else { >=20 > if (DisplayOnly) { >=20 > - // >=20 > - // display only >=20 > - // >=20 > - if (AcpiEx->HID =3D=3D 0) { >=20 > - UefiDevicePathLibCatPrint (Str, L"AcpiEx(%a,", HIDStr); >=20 > + if (Strings[HidStrIndex] !=3D NULL) { >=20 > + UefiDevicePathLibCatPrint (Str, L"AcpiEx(%a,", > Strings[HidStrIndex]); >=20 > } else { >=20 > UefiDevicePathLibCatPrint (Str, L"AcpiEx(%s,", HIDText); >=20 > } >=20 >=20 >=20 > - if (AcpiEx->CID =3D=3D 0) { >=20 > - UefiDevicePathLibCatPrint (Str, L"%a,", CIDStr); >=20 > + if (Strings[CidStrIndex] !=3D NULL) { >=20 > + UefiDevicePathLibCatPrint (Str, L"%a,", > Strings[CidStrIndex]); >=20 > } else { >=20 > UefiDevicePathLibCatPrint (Str, L"%s,", CIDText); >=20 > } >=20 >=20 >=20 > - if (AcpiEx->UID =3D=3D 0) { >=20 > - UefiDevicePathLibCatPrint (Str, L"%a)", UIDStr); >=20 > + if (Strings[UidStrIndex] !=3D NULL) { >=20 > + UefiDevicePathLibCatPrint (Str, L"%a)", > Strings[UidStrIndex]); >=20 > } else { >=20 > UefiDevicePathLibCatPrint (Str, L"0x%x)", AcpiEx->UID); >=20 > } >=20 > @@ -524,9 +539,9 @@ DevPathToTextAcpiEx ( >=20 > HIDText, >=20 > CIDText, >=20 > AcpiEx->UID, >=20 > - HIDStr, >=20 > - CIDStr, >=20 > - UIDStr >=20 > + Strings[HidStrIndex] !=3D NULL ? Strings[HidStrIndex] : '\0', >=20 > + Strings[CidStrIndex] !=3D NULL ? Strings[CidStrIndex] : '\0', >=20 > + Strings[UidStrIndex] !=3D NULL ? Strings[UidStrIndex] : '\0' >=20 > ); >=20 > } >=20 > } >=20 > -- >=20 > 2.39.2 >=20 >=20 -=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 (#109595): https://edk2.groups.io/g/devel/message/109595 Mute This Topic: https://groups.io/mt/101619978/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-