On 7/17/19 12:59 AM, Laszlo Ersek wrote: > The EDK II C Coding Standards Specification (v2.20) strongly discourages > variable declarations in nested block scope: > > 5 Source Files > 5.4 Code File Structure > 5.4.1 Scoping Rules > 5.4.1.1 Scope > >> Block (local) Scope >> >> [...] >> >> Data declarations may follow the opening brace of a compound statement, >> regardless of nesting depth, and before any code generating statements >> have been entered. Other than at the outermost block of a function body, >> this type of declaration is strongly discouraged. > > Hoist such variable declarations in Base64Decode() to the outermost > function scope. > > Cc: Liming Gao <liming....@intel.com> > Cc: Michael D Kinney <michael.d.kin...@intel.com> > Cc: Philippe Mathieu-Daudé <phi...@redhat.com> > Cc: Zhichao Gao <zhichao....@intel.com> > Fixes: 35e242b698cdc6205e99a6d6a188bf27fecf9fb4 > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1980 > Reported-by: Zhichao Gao <zhichao....@intel.com> > Signed-off-by: Laszlo Ersek <ler...@redhat.com> > --- > > Notes: > Repo: https://github.com/lersek/edk2.git > Branch: b64_decode_no_nested_bz1980 > > MdePkg/Library/BaseLib/String.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c > index 6198ccbc9672..45198373f25c 100644 > --- a/MdePkg/Library/BaseLib/String.c > +++ b/MdePkg/Library/BaseLib/String.c > @@ -1978,6 +1978,9 @@ Base64Decode ( > UINT32 Accumulator; > UINTN OriginalDestinationSize; > UINTN SourceIndex; > + CHAR8 SourceChar; > + UINT32 Base64Value; > + UINT8 DestinationOctet; > > if (DestinationSize == NULL) { > return RETURN_INVALID_PARAMETER; > @@ -2054,10 +2057,6 @@ Base64Decode ( > // Decoding loop. > // > for (SourceIndex = 0; SourceIndex < SourceSize; SourceIndex++) { > - CHAR8 SourceChar; > - UINT32 Base64Value; > - UINT8 DestinationOctet; > - > SourceChar = Source[SourceIndex]; > > // >
Reviewed-by: Philippe Mathieu-Daude <phi...@redhat.com> Tested-by: Philippe Mathieu-Daude <phi...@redhat.com> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43847): https://edk2.groups.io/g/devel/message/43847 Mute This Topic: https://groups.io/mt/32497166/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
