From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6C1311A1E0F for ; Wed, 12 Oct 2016 05:21:06 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 12 Oct 2016 05:21:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,482,1473145200"; d="scan'208";a="1063788557" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.34]) by orsmga002.jf.intel.com with ESMTP; 12 Oct 2016 05:21:04 -0700 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Liming Gao , Yonghong Zhu Date: Wed, 12 Oct 2016 20:19:47 +0800 Message-Id: <1476274836-10544-4-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1476274836-10544-1-git-send-email-hao.a.wu@intel.com> References: <1476274836-10544-1-git-send-email-hao.a.wu@intel.com> Subject: [PATCH 03/52] BaseTools/GenFfs: Avoid possible NULL pointer dereference X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Oct 2016 12:21:06 -0000 Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- BaseTools/Source/C/GenFfs/GenFfs.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c index 433b608..25a722a 100644 --- a/BaseTools/Source/C/GenFfs/GenFfs.c +++ b/BaseTools/Source/C/GenFfs/GenFfs.c @@ -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.
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
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,22 +915,24 @@ Returns: // // Open output file to write ffs data. // - remove(OutputFileName); - FfsFile = fopen (LongFilePath (OutputFileName), "wb"); - if (FfsFile == NULL) { - Error (NULL, 0, 0001, "Error opening file", OutputFileName); - goto Finish; - } - // - // write header - // - fwrite (&FfsFileHeader, 1, HeaderSize, FfsFile); - // - // write data - // - fwrite (FileBuffer, 1, FileSize - HeaderSize, FfsFile); + if (OutputFileName != NULL) { + remove(OutputFileName); + FfsFile = fopen (LongFilePath (OutputFileName), "wb"); + if (FfsFile == NULL) { + Error (NULL, 0, 0001, "Error opening file", OutputFileName); + goto Finish; + } + // + // write header + // + fwrite (&FfsFileHeader, 1, HeaderSize, FfsFile); + // + // write data + // + fwrite (FileBuffer, 1, FileSize - HeaderSize, FfsFile); - fclose (FfsFile); + fclose (FfsFile); + } Finish: if (InputFileName != NULL) { -- 1.9.5.msysgit.0