pointer verification (not NULL) and buffer overrun fixes.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11459 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 3 insertions, 3 deletions

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
index 60e0b75435..675850cff4 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
@@ -637,7 +637,7 @@ HBufferImageRestoreMousePosition (
         CurrentLine = HBufferImage.CurrentLine;

         Line        = HMoveLine (FRow - HBufferImage.BufferPosition.Row);

 

-        if (FColumn > Line->Size) {

+        if (Line == NULL || FColumn > Line->Size) {

           HasCharacter = FALSE;

         }

 

@@ -1620,7 +1620,7 @@ Returns:
       //

       HBufferImage.BufferPosition.Row = NewFilePosRow;

       if (RowGap <= 0) {

-        Abs = -RowGap;

+        Abs = (UINTN)ABS(RowGap);

         HBufferImage.DisplayPosition.Row -= Abs;

       } else {

         HBufferImage.DisplayPosition.Row += RowGap;

@@ -1931,7 +1931,7 @@ Returns:
   //

   // if that line, is not that long, so move to the end of that line

   //

-  if (FCol > Line->Size) {

+  if (Line != NULL && FCol > Line->Size) {

     FCol      = Line->Size + 1;

     HighBits  = TRUE;

   }