tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools/EfiRom: Avoid possible NULL pointer dereference

Browse Source 
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
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 2016-10-11 10:06:50 +08:00
parent 2ff3293d7b
commit 02875ba228
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
BaseTools/Source/C/EfiRom/EfiRom.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Utility program to create an EFI option ROM image from binary and EFI PE32 files. Utility program to create an EFI option ROM image from binary and EFI PE32 files.
Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this under the terms and conditions of the BSD License which accompanies this
distribution. The full text of the license may be found at distribution. The full text of the license may be found at
@ -95,24 +95,26 @@ Returns:
// the command line, or the first input filename with a different extension. // the command line, or the first input filename with a different extension.
// //
if (!mOptions.OutFileName[0]) { if (!mOptions.OutFileName[0]) {
strcpy (mOptions.OutFileName, mOptions.FileList->FileName); if (mOptions.FileList != NULL) {
// strcpy (mOptions.OutFileName, mOptions.FileList->FileName);
// Find the last . on the line and replace the filename extension with //
// the default // Find the last . on the line and replace the filename extension with
// // the default
for (Ext = mOptions.OutFileName + strlen (mOptions.OutFileName) - 1; //
(Ext >= mOptions.OutFileName) && (*Ext != '.') && (*Ext != '\\'); for (Ext = mOptions.OutFileName + strlen (mOptions.OutFileName) - 1;
Ext-- (Ext >= mOptions.OutFileName) && (*Ext != '.') && (*Ext != '\\');
) Ext--
; )
// ;
// If dot here, then insert extension here, otherwise append //
// // If dot here, then insert extension here, otherwise append
if (*Ext != '.') { //
Ext = mOptions.OutFileName + strlen (mOptions.OutFileName); if (*Ext != '.') {
} Ext = mOptions.OutFileName + strlen (mOptions.OutFileName);
}
strcpy (Ext, DEFAULT_OUTPUT_EXTENSION); strcpy (Ext, DEFAULT_OUTPUT_EXTENSION);
}
} }
// //
// Make sure we don't have the same filename for input and output files // Make sure we don't have the same filename for input and output files