From nobody Tue Apr 23 23:24:06 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+56028+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+56028+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; t=1584638481; cv=none; d=zohomail.com; s=zohoarc; b=cJ5WFmUUnfZteOKVHDcmm8u04yrc+rDUS8LvU7AUqkJHjSCNXlS7rLKrM3EXnX/heLwPcwx5sNGXl5UxseXVTyMQM9kDstWdg7o8Z/dUwEDkxBkHKLo/V6Qr4cH1lIHQpCHGKPTOIkKZ9HypOraNt4QxnzyYmz7Sd6aQVntl5Es= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584638481; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=qcOHv6kpiJ+lDOAt5MIRy+A66jNPNwM1yZgtVLSCqQo=; b=OYSmh8F3aueJHunYSgfSlGc8mOaajQY+tmcsHetWcLA6gYoqc+aE7vqMB+ZM/PfeFw2zPiKQ2DK2XKLDV/bqnH6VQDV/Pmetrc03bPtQ1nuFnWa3hk8holbj+Gju4NyNguIfb7iWdO71YX8DmGVaYIWete11YNVCHosqHcE5LQM= ARC-Authentication-Results: i=1; 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+56028+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1584638481214705.9099884115508; Thu, 19 Mar 2020 10:21:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5iGgYY1788612x0hMu4RH8K0; Thu, 19 Mar 2020 10:21:20 -0700 X-Received: from hqnvemgate25.nvidia.com (hqnvemgate25.nvidia.com [216.228.121.64]) by mx.groups.io with SMTP id smtpd.web11.201.1584638479437375343 for ; Thu, 19 Mar 2020 10:21:19 -0700 X-Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 19 Mar 2020 10:20:29 -0700 X-Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Thu, 19 Mar 2020 10:21:19 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Thu, 19 Mar 2020 10:21:19 -0700 X-Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 19 Mar 2020 17:21:18 +0000 X-Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Thu, 19 Mar 2020 17:21:19 +0000 X-Received: from jbrasen-ux.nvidia.com (Not Verified[10.28.48.132]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Thu, 19 Mar 2020 10:21:18 -0700 From: "Jeff Brasen" To: CC: , , Jeff Brasen Subject: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string Date: Thu, 19 Mar 2020 11:21:09 -0600 Message-ID: X-NVConfidentiality: public MIME-Version: 1.0 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,jbrasen@nvidia.com X-Gm-Message-State: RtYfaBooohXKluNAphSHibJax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1584638480; bh=zLFU8ZwS2lC949bozj3AWbba7ZqcBNKtuaYLEQqIJ6w=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ItB/zgrz5owblxBDkIntdSteDriWRQXsFBQgs2yPnVB2Jjo4pPYVigUynlQnxGP7+jU nN7J5XGftiu3Jej+jdXgMYrPHg8u1UpXVrxB8yf4s8tXGxGOW4cpCA9PKPXh1ZCt4l5rl YYxlRkga7ioiDRGkVHluJOvDxE12c3Mhflg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update function behavior to not modify the incoming string that is marked as CONST in the prototype. Signed-off-by: Jeff Brasen Reviewed-by: Dandan Bi --- .../Universal/HiiDatabaseDxe/ConfigRouting.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeMod= ulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index 2cad6d29f4..e08a62c387 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -5497,7 +5497,6 @@ HiiBlockToConfig ( UINTN Index; UINT8 *TemBuffer; CHAR16 *TemString; - CHAR16 TemChar; =20 TmpBuffer =3D NULL; =20 @@ -5564,10 +5563,14 @@ HiiBlockToConfig ( // // Copy and an additional '&' to // - TemChar =3D *StringPtr; - *StringPtr =3D '\0'; - AppendToMultiString(Config, ConfigRequest); - *StringPtr =3D TemChar; + + TemString =3D AllocateCopyPool (sizeof (CHAR16) * (StringPtr - ConfigReq= uest + 1), ConfigRequest); + if (TemString =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + TemString[StringPtr - ConfigRequest] =3D '\0'; + AppendToMultiString(Config, TemString); + FreePool (TemString); =20 // // Parse each if exists --=20 2.17.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 (#56028): https://edk2.groups.io/g/devel/message/56028 Mute This Topic: https://groups.io/mt/72080435/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-