* [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
@ 2020-03-19 17:21 Jeff Brasen
2020-03-24 14:26 ` [edk2-devel] " Dandan Bi
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Brasen @ 2020-03-19 17:21 UTC (permalink / raw)
To: devel; +Cc: dandan.bi, eric.dong, Jeff Brasen
Update function behavior to not modify the incoming string that is
marked as CONST in the prototype.
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
.../Universal/HiiDatabaseDxe/ConfigRouting.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/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;
TmpBuffer = NULL;
@@ -5564,10 +5563,14 @@ HiiBlockToConfig (
//
// Copy <ConfigHdr> and an additional '&' to <ConfigResp>
//
- 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 <RequestElement> if exists
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
2020-03-19 17:21 [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string Jeff Brasen
@ 2020-03-24 14:26 ` Dandan Bi
0 siblings, 0 replies; 6+ messages in thread
From: Dandan Bi @ 2020-03-24 14:26 UTC (permalink / raw)
To: devel@edk2.groups.io, jbrasen@nvidia.com; +Cc: Dong, Eric
Thanks for the update.
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Thanks,
Dandan
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Jeff Brasen
> Sent: Friday, March 20, 2020 1:21 AM
> To: devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Jeff Brasen <jbrasen@nvidia.com>
> Subject: [edk2-devel] [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 <jbrasen@nvidia.com>
> ---
> .../Universal/HiiDatabaseDxe/ConfigRouting.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> b/MdeModulePkg/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;
>
> TmpBuffer = NULL;
>
> @@ -5564,10 +5563,14 @@ HiiBlockToConfig (
> //
> // Copy <ConfigHdr> and an additional '&' to <ConfigResp>
> //
> - 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 <RequestElement> if exists
> --
> 2.17.1
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
@ 2020-09-11 17:08 Jeff Brasen
2020-09-14 14:15 ` Dandan Bi
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Brasen @ 2020-09-11 17:08 UTC (permalink / raw)
To: devel; +Cc: dandan.bi, eric.dong, Jeff Brasen
Update function behavior to not modify the incoming string that is
marked as CONST in the prototype.
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
.../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 <ConfigHdr> and an additional '&' to <ConfigResp>
//
- 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 <RequestElement> if exists
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
2020-09-11 17:08 Jeff Brasen
@ 2020-09-14 14:15 ` Dandan Bi
2020-09-22 22:12 ` Jeff Brasen
0 siblings, 1 reply; 6+ messages in thread
From: Dandan Bi @ 2020-09-14 14:15 UTC (permalink / raw)
To: Jeff Brasen, devel@edk2.groups.io; +Cc: Dong, Eric
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Thanks,
Dandan
> -----Original Message-----
> From: Jeff Brasen <jbrasen@nvidia.com>
> Sent: Saturday, September 12, 2020 1:09 AM
> To: devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Jeff Brasen <jbrasen@nvidia.com>
> 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 <jbrasen@nvidia.com>
> ---
> .../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 <ConfigHdr> and an additional '&' to <ConfigResp> //-
> 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 <RequestElement> if
> exists--
> 2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
2020-09-14 14:15 ` Dandan Bi
@ 2020-09-22 22:12 ` Jeff Brasen
2020-10-05 21:27 ` Jeff Brasen
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Brasen @ 2020-09-22 22:12 UTC (permalink / raw)
To: Bi, Dandan, devel@edk2.groups.io; +Cc: Dong, Eric
[-- Attachment #1: Type: text/plain, Size: 2294 bytes --]
Thanks Dandan, are we waiting for any additional reviews on this change?
Thanks,
Jeff
________________________________
From: Bi, Dandan <dandan.bi@intel.com>
Sent: Monday, September 14, 2020 8:15 AM
To: Jeff Brasen <jbrasen@nvidia.com>; devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Dong, Eric <eric.dong@intel.com>
Subject: RE: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
External email: Use caution opening links or attachments
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Thanks,
Dandan
> -----Original Message-----
> From: Jeff Brasen <jbrasen@nvidia.com>
> Sent: Saturday, September 12, 2020 1:09 AM
> To: devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Jeff Brasen <jbrasen@nvidia.com>
> 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 <jbrasen@nvidia.com>
> ---
> .../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 <ConfigHdr> and an additional '&' to <ConfigResp> //-
> 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 <RequestElement> if
> exists--
> 2.25.1
[-- Attachment #2: Type: text/html, Size: 4205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
2020-09-22 22:12 ` Jeff Brasen
@ 2020-10-05 21:27 ` Jeff Brasen
0 siblings, 0 replies; 6+ messages in thread
From: Jeff Brasen @ 2020-10-05 21:27 UTC (permalink / raw)
To: Bi, Dandan, devel@edk2.groups.io; +Cc: Dong, Eric
[-- Attachment #1: Type: text/plain, Size: 2953 bytes --]
Are we looking for any other reviews on this?
Thanks,
Jeff
From: Jeff Brasen <jbrasen@nvidia.com>
Sent: Tuesday, September 22, 2020 4:13 PM
To: Bi, Dandan <dandan.bi@intel.com>; devel@edk2.groups.io
Cc: Dong, Eric <eric.dong@intel.com>
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 <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>
Sent: Monday, September 14, 2020 8:15 AM
To: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>
Cc: Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>
Subject: RE: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
External email: Use caution opening links or attachments
Reviewed-by: Dandan Bi <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>
Thanks,
Dandan
> -----Original Message-----
> From: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> Sent: Saturday, September 12, 2020 1:09 AM
> To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> Cc: Bi, Dandan <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>; Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>;
> Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> 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 <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> ---
> .../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 <ConfigHdr> and an additional '&' to <ConfigResp> //-
> 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 <RequestElement> if
> exists--
> 2.25.1
[-- Attachment #2: Type: text/html, Size: 6870 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-05 21:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-19 17:21 [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string Jeff Brasen
2020-03-24 14:26 ` [edk2-devel] " Dandan Bi
-- strict thread matches above, loose matches on Subject: below --
2020-09-11 17:08 Jeff Brasen
2020-09-14 14:15 ` Dandan Bi
2020-09-22 22:12 ` Jeff Brasen
2020-10-05 21:27 ` Jeff Brasen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox