From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.groups.io with SMTP id smtpd.web10.11631.1601981364751382200 for ; Tue, 06 Oct 2020 03:49:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XPPidVGH; spf=pass (domain: redhat.com, ip: 63.128.21.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601981364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ay1iawlfVjtOhQtEy6ZRgWmN/pFFJ0+D/fK4GvUv6Dk=; b=XPPidVGHDjYwrEztgT6ufCe1RSQG2viFjQuDFmZUQNI/rkDbR/MITf77wAmz0qexr58mBv b8GjEhsWVsJcjmHIl+fpl7TPi6ONZBekI1AwMzaJj45KhnNwv2NorRhljc2KHZaBUAPryV 4jXrbr6zcjl6QKuBcWETg8ejpbjhVKY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-496-B1lsAPccNDmvId_VJF0QSg-1; Tue, 06 Oct 2020 06:49:20 -0400 X-MC-Unique: B1lsAPccNDmvId_VJF0QSg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2987D802B51; Tue, 6 Oct 2020 10:49:19 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-235.ams2.redhat.com [10.36.112.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id E01D67882A; Tue, 6 Oct 2020 10:49:17 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string To: devel@edk2.groups.io, jbrasen@nvidia.com, "Bi, Dandan" Cc: "Dong, Eric" References: <0cb9d71f50baf3c98522b5d20e4083da458050da.1599843970.git.jbrasen@nvidia.com> From: "Laszlo Ersek" Message-ID: <59c9ff26-2dc2-9728-4074-ac42c64bd916@redhat.com> Date: Tue, 6 Oct 2020 12:49:16 +0200 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit On 10/05/20 23:27, Jeff Brasen wrote: > Are we looking for any other reviews on this? I don't think so; Dandan is a designated reviewer for "MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c". The MdeModulePkg maintainers should merge this patch. (Dandan seems to have no "M" access anywhere in edk2, so the PR needs to be submitted by someone else.) I could merge this myself, but I'm trying to make a point that maintainership is a service to the community. Thanks Laszlo > > Thanks, > Jeff > > > From: Jeff Brasen > Sent: Tuesday, September 22, 2020 4:13 PM > To: Bi, Dandan ; devel@edk2.groups.io > Cc: Dong, Eric > Subject: Re: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string > > Thanks Dandan, are we waiting for any additional reviews on this change? > > > Thanks, > > Jeff > > ________________________________ > From: Bi, Dandan > > Sent: Monday, September 14, 2020 8:15 AM > To: Jeff Brasen >; devel@edk2.groups.io > > Cc: Dong, Eric > > Subject: RE: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string > > External email: Use caution opening links or attachments > > > Reviewed-by: Dandan Bi > > > > Thanks, > Dandan >> -----Original Message----- >> From: Jeff Brasen > >> Sent: Saturday, September 12, 2020 1:09 AM >> To: devel@edk2.groups.io >> Cc: Bi, Dandan >; Dong, Eric >; >> Jeff Brasen > >> Subject: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string >> >> Update function behavior to not modify the incoming string that is marked as >> CONST in the prototype. >> >> Signed-off-by: Jeff Brasen > >> --- >> .../Universal/HiiDatabaseDxe/ConfigRouting.c | 12 +++++++----- >> 1 file changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c >> b/MdeModulePkg/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; TmpBuffer = NULL; @@ - >> 5564,10 +5563,13 @@ HiiBlockToConfig ( >> // // Copy and an additional '&' to //- >> TemChar = *StringPtr;- *StringPtr = '\0';- AppendToMultiString(Config, >> ConfigRequest);- *StringPtr = TemChar;+ TemString = AllocateCopyPool >> (sizeof (CHAR16) * (StringPtr - ConfigRequest + 1), ConfigRequest);+ if >> (TemString == NULL) {+ return EFI_OUT_OF_RESOURCES;+ }+ >> TemString[StringPtr - ConfigRequest] = '\0';+ AppendToMultiString(Config, >> TemString);+ FreePool (TemString); // // Parse each if >> exists-- >> 2.25.1 > > > > > >