BaseTools/C/Common: Add checks for array access

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/BaseTools/Source/C/Common/SimpleFileParsing.c b/BaseTools/Source/C/Common/SimpleFileParsing.c
index 868c6b794b..209a0954b3 100644
--- a/BaseTools/Source/C/Common/SimpleFileParsing.c
+++ b/BaseTools/Source/C/Common/SimpleFileParsing.c
@@ -1,7 +1,7 @@
 /** @file

 Generic but simple file parsing routines.

 

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -1232,12 +1232,10 @@ GetHexChars (
 {

   UINT32  Len;

   Len = 0;

-  while (!EndOfFile (&mGlobals.SourceFile) && (BufferLen > 0)) {

+  while (!EndOfFile (&mGlobals.SourceFile) && (Len < BufferLen)) {

     if (isxdigit ((int)mGlobals.SourceFile.FileBufferPtr[0])) {

-      *Buffer = mGlobals.SourceFile.FileBufferPtr[0];

-      Buffer++;

+      Buffer[Len] = mGlobals.SourceFile.FileBufferPtr[0];

       Len++;

-      BufferLen--;

       mGlobals.SourceFile.FileBufferPtr++;

     } else {

       break;

@@ -1246,8 +1244,8 @@ GetHexChars (
   //

   // Null terminate if we can

   //

-  if ((Len > 0) && (BufferLen > 0)) {

-    *Buffer = 0;

+  if ((Len > 0) && (Len < BufferLen)) {

+    Buffer[Len] = 0;

   }

 

   return Len;