tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Hao Wu 2017-11-30 14:29:25 +08:00
parent 5e125e7752
commit 58356e9478
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BaseTools/Source/C/Common/Decompress.c
View File

@ -2,7 +2,7 @@
Decompressor. Algorithm Ported from OPSD code (Decomp.asm) for Efi and Tiano Decompressor. Algorithm Ported from OPSD code (Decomp.asm) for Efi and Tiano
compress algorithm. compress algorithm.
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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -394,7 +394,7 @@ Returns:
Index = 0; Index = 0;
while (Index < Number) { while (Index < Number && Index < NPT) {
CharC = (UINT16) (Sd->mBitBuf >> (BITBUFSIZ - 3)); CharC = (UINT16) (Sd->mBitBuf >> (BITBUFSIZ - 3));
@ -413,14 +413,14 @@ Returns:
if (Index == Special) { if (Index == Special) {
CharC = (UINT16) GetBits (Sd, 2); CharC = (UINT16) GetBits (Sd, 2);
CharC--; CharC--;
while ((INT16) (CharC) >= 0) { while ((INT16) (CharC) >= 0 && Index < NPT) {
Sd->mPTLen[Index++] = 0; Sd->mPTLen[Index++] = 0;
CharC--; CharC--;
} }
} }
} }
while (Index < nn) { while (Index < nn && Index < NPT) {
Sd->mPTLen[Index++] = 0; Sd->mPTLen[Index++] = 0;
} }

12
BaseTools/Source/C/Common/SimpleFileParsing.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Generic but simple file parsing routines. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -1232,12 +1232,10 @@ GetHexChars (
{ {
UINT32 Len; UINT32 Len;
Len = 0; Len = 0;
while (!EndOfFile (&mGlobals.SourceFile) && (BufferLen > 0)) { while (!EndOfFile (&mGlobals.SourceFile) && (Len < BufferLen)) {
if (isxdigit ((int)mGlobals.SourceFile.FileBufferPtr[0])) { if (isxdigit ((int)mGlobals.SourceFile.FileBufferPtr[0])) {
*Buffer = mGlobals.SourceFile.FileBufferPtr[0]; Buffer[Len] = mGlobals.SourceFile.FileBufferPtr[0];
Buffer++;
Len++; Len++;
BufferLen--;
mGlobals.SourceFile.FileBufferPtr++; mGlobals.SourceFile.FileBufferPtr++;
} else { } else {
break; break;
@ -1246,8 +1244,8 @@ GetHexChars (
// //
// Null terminate if we can // Null terminate if we can
// //
if ((Len > 0) && (BufferLen > 0)) { if ((Len > 0) && (Len < BufferLen)) {
*Buffer = 0; Buffer[Len] = 0;
} }
return Len; return Len;