<html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Reviewed-by: Andrew Fish <<a href="mailto:afish@apple.com" class="">afish@apple.com</a>> <div> </div><div>Thanks,</div><div> </div><div>Andrew Fish</div><div> <blockquote type="cite" class=""><div class="">On Jul 16, 2019, at 9:58 AM, Carsey, Jaben <<a href="mailto:jaben.carsey@intel.com" class="">jaben.carsey@intel.com</a>> wrote:</div> <div class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Reviewed-by: Jaben Carsey <<a href="mailto:jaben.carsey@intel.com" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">jaben.carsey@intel.com</a><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Thanks<br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">-Jaben<br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">-----Original Message----- From: Gao, Zhichao Sent: Tuesday, July 16, 2019 2:12 AM To: <a href="mailto:devel@edk2.groups.io" class="">devel@edk2.groups.io</a> Cc: Carsey, Jaben <<a href="mailto:jaben.carsey@intel.com" class="">jaben.carsey@intel.com</a>>; Ni, Ray <<a href="mailto:ray.ni@intel.com" class="">ray.ni@intel.com</a>>; Andrew Fish <<a href="mailto:afish@apple.com" class="">afish@apple.com</a>> Subject: [PATCH V2] ShellPkg/Type.c: Add value check before (LoopVar - 1) REF: <a href="https://bugzilla.tianocore.org/show_bug.cgi?id=1964" class="">https://bugzilla.tianocore.org/show_bug.cgi?id=1964</a> 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. Same change in Unicode section. Cc: Jaben Carsey <<a href="mailto:jaben.carsey@intel.com" class="">jaben.carsey@intel.com</a>> Cc: Ray Ni <<a href="mailto:ray.ni@intel.com" class="">ray.ni@intel.com</a>> Cc: Andrew Fish <<a href="mailto:afish@apple.com" class="">afish@apple.com</a>> Signed-off-by: Zhichao Gao <<a href="mailto:zhichao.gao@intel.com" class="">zhichao.gao@intel.com</a>> --- V2: 1. Update the copyright 2. Fix the same issue in unicode section 3. Fix typo .../Library/UefiShellLevel3CommandsLib/Type.c | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c index 4efc0a8e24..f0aa57af3d 100644 --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c @@ -2,7 +2,7 @@ Main file for Type shell level 3 function. (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P. - Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved. + Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -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 with line feed for displaying each new line from left. // ShellPrintEx (-1, -1, L"\r\n"); continue; @@ -121,12 +122,13 @@ TypeFileByHandle ( // Allow Line Feed (LF) (0xA) & Carriage Return (CR) (0xD) // characters to be displayed as is. // - if (Ucs2Char == '\n' && ((CHAR16*)Buffer)[LoopVar-1] != '\r') { + if ((Ucs2Char == '\n' && LoopVar == 0) || + (Ucs2Char == '\n' && ((CHAR16*)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 with line feed for displaying each new line from left. // ShellPrintEx (-1, -1, L"\r\n"); continue; -- 2.21.0.windows.1 </blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class=""></div></blockquote></div> </body></html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/43810">View/Reply Online (#43810)</a> | | <a target="_blank" href="https://groups.io/mt/32488137/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>