| Message ID | ED077930C258884BBCB450DB737E66221219FF47@SHSMSX102.ccr.corp.intel.com |
|---|---|
| State | New |
| Headers | show |
On 24 June 2013 08:44, Dong, Eric <eric.dong@intel.com> wrote: > This change is not correct, the "Buffer" variable is not defined. Hmmm, isn't that curious! I've not really looked that this change before, which is my mistake for accepting it, but you're right, Buffer is not defined. I think look into this one properly! Thanks Eric. > > -----Original Message----- > From: Ryan Harkin [mailto:ryan.harkin@linaro.org] > Sent: Friday, June 21, 2013 3:48 PM > To: ryan.harkin@linaro.org; edk2-devel@lists.sourceforge.net; patches@linaro.org; boot-architecture@lists.linaro.org > Subject: [edk2] [PATCH] MdeModulePkg: fix compilation errors > > From: Leif Lindholm <leif.lindholm@linaro.org> > > This patch fixes a minor error that prevents the native ARM compiler from building the code. > > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org > Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> > --- > .../Universal/SetupBrowserDxe/Expression.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c > index cd29e29..29de503 100644 > --- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c > @@ -1511,7 +1511,7 @@ IfrMid ( > Result->BufferLen = (UINT16)((BufferLen - Base) < Length ? (BufferLen - Base) : Length); > Result->Buffer = AllocateZeroPool (Result->BufferLen); > ASSERT (Result->Buffer != NULL); > - CopyMem (Result->Buffer, &Value[2].Buffer[Base], Result->BufferLen); > + CopyMem (Result->Buffer, &Buffer[Base], Result->BufferLen); > } > > FreePool (Value[2].Buffer); > -- > 1.7.9.5 > > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by Windows: > > Build for Windows Store. > > http://p.sf.net/sfu/windows-dev2dev > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-devel
On 24 June 2013 10:08, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On 24 June 2013 08:44, Dong, Eric <eric.dong@intel.com> wrote: >> This change is not correct, the "Buffer" variable is not defined. > > Hmmm, isn't that curious! I've not really looked that this change > before, which is my mistake for accepting it, but you're right, Buffer > is not defined. This patch was obsoleted by r14214, so shouldn't have been pushed. Regards, Leif
On 24 June 2013 11:44, Leif Lindholm <leif.lindholm@linaro.org> wrote: > On 24 June 2013 10:08, Ryan Harkin <ryan.harkin@linaro.org> wrote: >> On 24 June 2013 08:44, Dong, Eric <eric.dong@intel.com> wrote: >>> This change is not correct, the "Buffer" variable is not defined. >> >> Hmmm, isn't that curious! I've not really looked that this change >> before, which is my mistake for accepting it, but you're right, Buffer >> is not defined. > > This patch was obsoleted by r14214, so shouldn't have been pushed. Yes, Leif has just reminded me of a conversation we had about this previously. Sorry for the noise, I'll drop the patch... > Regards, > > Leif
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c index cd29e29..29de503 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c @@ -1511,7 +1511,7 @@ IfrMid ( Result->BufferLen = (UINT16)((BufferLen - Base) < Length ? (BufferLen - Base) : Length); Result->Buffer = AllocateZeroPool (Result->BufferLen); ASSERT (Result->Buffer != NULL); - CopyMem (Result->Buffer, &Value[2].Buffer[Base], Result->BufferLen); + CopyMem (Result->Buffer, &Buffer[Base], Result->BufferLen); } FreePool (Value[2].Buffer);