BaseTools/GenFfs: Avoid possible NULL pointer dereference

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:13:26 +08:00
parent 02875ba228
commit 2cb8743524
1 changed files with 19 additions and 17 deletions

View File

@ -1,7 +1,7 @@
/** @file
This file contains functions required to generate a Firmware File System file.
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2016, 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
@ -842,7 +842,7 @@ Returns:
);
}
if (EFI_ERROR (Status)) {
if (EFI_ERROR (Status) || (FileBuffer == NULL)) {
goto Finish;
}
@ -915,6 +915,7 @@ Returns:
//
// Open output file to write ffs data.
//
if (OutputFileName != NULL) {
remove(OutputFileName);
FfsFile = fopen (LongFilePath (OutputFileName), "wb");
if (FfsFile == NULL) {
@ -931,6 +932,7 @@ Returns:
fwrite (FileBuffer, 1, FileSize - HeaderSize, FfsFile);
fclose (FfsFile);
}
Finish:
if (InputFileName != NULL) {