From nobody Wed Apr 24 13:39:35 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+65192+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+65192+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; t=1599844148; cv=none; d=zohomail.com; s=zohoarc; b=RXCvRInneMKqDFe+OTFruq/Q6txmg5aJt4YOoUnGUZbwCvM16g9//BYcItY/7IoRPQOXaS/v9HMZ76N8I4+LflpvF1Q/Ow9PkSb6KV5uMmFDK7BY83pKgSJ5Cfk60laYYb+7bmdUkQFMIMGc5qSFZpeiXMS1BzXAq/CfKr528/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599844148; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=p10/VFjWEKejuPC3Q3QftTn1gV5hBZa/qyC8DECGcE4=; b=XnzFK7sO73qm9wOIiE0W5amEByr++H5hEHJKoZzBMcLBopwFSh+IlT0OvFDGQyAPSfiJ5U8G149shnxktRub0U+NoSUEHiDyn5AKCMwwjAJKSWXm1RKBlOM6glJEpMs0t6TbvPMzLX2prKJmRLkr3ggsvtEfWr0ra21/PCEcPLo= 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+65192+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 159984414867196.87121781349379; Fri, 11 Sep 2020 10:09:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id OnVJYY1788612xLi8aYqDp2X; Fri, 11 Sep 2020 10:09:08 -0700 X-Received: from hqnvemgate24.nvidia.com (hqnvemgate24.nvidia.com [216.228.121.143]) by mx.groups.io with SMTP id smtpd.web10.244.1599844147677623186 for ; Fri, 11 Sep 2020 10:09:07 -0700 X-Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 11 Sep 2020 10:06:49 -0700 X-Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Fri, 11 Sep 2020 10:09:07 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Fri, 11 Sep 2020 10:09:07 -0700 X-Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 11 Sep 2020 17:09:06 +0000 X-Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Fri, 11 Sep 2020 17:09:06 +0000 X-Received: from jbrasen-ux.nvidia.com (Not Verified[10.20.23.99]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Fri, 11 Sep 2020 10:09:06 -0700 From: "Jeff Brasen" To: CC: , , Jeff Brasen Subject: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string Date: Fri, 11 Sep 2020 11:08:42 -0600 Message-ID: <0cb9d71f50baf3c98522b5d20e4083da458050da.1599843970.git.jbrasen@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public 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: gb5FQumB2nyO2zm0h962pJI5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1599844148; bh=Y4sihJTzlgkomTJeoP5W1rwcjJmVI/l8r+Sy585520Q=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=qAr1n2CtzDPGQ3gY+mb7a7MHspdNW9sKmpPWVhNUe7EsChzOIoBG0pb3LF2jLrXthHO 78BHdxQplGlkPfJOtdCXx3ry++iWXD6bARA5b+j2p5avxrFxxKHp8LAWcGf9OF5J5rnz/ Yv1S38Go/jf6043NJDO52yzqipc7CcB8arM= X-ZohoMail-DKIM: pass (identity @groups.io) 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 > Reviewed-by: Dandan Bi Reviewed-by:=C2=A0Dandan Bi --- .../Universal/HiiDatabaseDxe/ConfigRouting.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeMod= ulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index 2cad6d29f4..d492b769d5 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,13 @@ 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.25.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 (#65192): https://edk2.groups.io/g/devel/message/65192 Mute This Topic: https://groups.io/mt/76784317/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-