From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"jim.dailey@dell.com" <jim.dailey@dell.com>
Cc: "Carsey, Jaben" <jaben.carsey@intel.com>,
"Ni, Ray" <ray.ni@intel.com>, "afish@apple.com" <afish@apple.com>
Subject: Re: [edk2-devel] [PATCH] ShellPkg/Type.c: Add value check before (LoopVar - 1)
Date: Tue, 16 Jul 2019 00:14:54 +0000 [thread overview]
Message-ID: <3CE959C139B4C44DBEA1810E3AA6F9000B807F8C@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <50888903371147858e578ab497b2c66c@ausx13mps335.AMER.DELL.COM>
You are right. I missed the USC2 section. I would update that in next version.
Thanks,
Zhichao
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Jim Dailey
> Sent: Monday, July 15, 2019 9:09 PM
> To: Gao, Zhichao <zhichao.gao@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> afish@apple.com; devel@edk2.groups.io
> Subject: Re: [edk2-devel] [PATCH] ShellPkg/Type.c: Add value check before
> (LoopVar - 1)
>
> Zhichao,
>
> I believe the same problem exists further into the function in the 'else'
> clause handling UCS2 characters.
>
> Regards,
> Jim
>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gao,
> Zhichao
> Sent: Monday, July 15, 2019 2:30 AM
> To: devel@edk2.groups.io
> Cc: Jaben Carsey; Ray Ni; Andrew Fish
> Subject: [edk2-devel] [PATCH] ShellPkg/Type.c: Add value check before
> (LoopVar - 1)
>
>
> [EXTERNAL EMAIL]
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1964
>
> If the file begin with single line Feed ('\n'), then "AsciiChar == '\n' &&
> ((CHAR8*)Buffer)[LoopVar-1] != '\r'"
> would cause a underflow. Add this condition "(AsciiChar == '\n' && LoopVar
> == 0)" before it to make sure (LoopVar - 1) would never encounter a
> underflow.
>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
> ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
> b/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
> index 4efc0a8e24..c1f670c713 100644
> --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
> +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
> @@ -78,12 +78,13 @@ TypeFileByHandle (
> // Allow Line Feed (LF) (0xA) & Carriage Return (CR) (0xD)
> // characters to be displayed as is.
> //
> - if (AsciiChar == '\n' && ((CHAR8*)Buffer)[LoopVar-1] != '\r') {
> + if ((AsciiChar == '\n' && LoopVar == 0) ||
> + (AsciiChar == '\n' && ((CHAR8*)Buffer)[LoopVar-1] !=
> + '\r')) {
> //
> - // In case Line Feed (0xA) is encountered & Carriage Return (0xD)
> - // was not the previous character, print CR and LF. This is because
> - // Shell 2.0 requires carriage return with line feed for displaying
> - // each new line from left.
> + // In case file begin with single line Feed or Line Feed (0xA) is
> + // encountered & Carriage Return (0xD) was not previous character,
> + // print CR and LF. This is because Shell 2.0 requires carriage
> + // return Swith line feed for displaying each new line from left.
> //
> ShellPrintEx (-1, -1, L"\r\n");
> continue;
> --
> 2.21.0.windows.1
>
>
>
>
> Dell Corporation Limited is registered in England and Wales. Company
> Registration Number: 2081369
> Registered address: Dell House, The Boulevard, Cain Road, Bracknell,
> Berkshire, RG12 1LF, UK.
> Company details for other Dell UK entities can be found on www.dell.co.uk.
>
>
>
next prev parent reply other threads:[~2019-07-16 0:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 7:30 [PATCH] ShellPkg/Pci.c: Update supported link speed to PCI4.0 Gao, Zhichao
2019-07-15 7:30 ` [PATCH] ShellPkg/Type.c: Add value check before (LoopVar - 1) Gao, Zhichao
2019-07-15 13:09 ` [edk2-devel] " Jim Dailey
2019-07-16 0:14 ` Gao, Zhichao [this message]
2019-07-15 14:30 ` Carsey, Jaben
2019-07-15 7:30 ` [PATCH] ShellPkg/UefiHandleParsingLib: Fix error allocate pool Gao, Zhichao
2019-07-15 7:30 ` [PATCH] ShellPkg/UefiShellDriver1CommandsLib: Make array big enough Gao, Zhichao
[not found] ` <15B1842A1397F2E7.11928@groups.io>
2019-11-28 2:22 ` [edk2-devel] [PATCH] ShellPkg/UefiHandleParsingLib: Fix error allocate pool Gao, Zhichao
2019-11-28 4:49 ` Ni, Ray
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3CE959C139B4C44DBEA1810E3AA6F9000B807F8C@SHSMSX101.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox