public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Hao Wu <hao.a.wu@intel.com>
To: edk2-devel@lists.01.org
Cc: Hao Wu <hao.a.wu@intel.com>, Liming Gao <liming.gao@intel.com>,
	Yonghong Zhu <yonghong.zhu@intel.com>
Subject: [PATCH v2 03/53] BaseTools/GenFfs: Avoid possible NULL pointer dereference
Date: Thu,  3 Nov 2016 15:22:13 +0800	[thread overview]
Message-ID: <1478157783-9368-4-git-send-email-hao.a.wu@intel.com> (raw)
In-Reply-To: <1478157783-9368-1-git-send-email-hao.a.wu@intel.com>

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>
---
 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 9a738cb..78e5097 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.<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,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



  parent reply	other threads:[~2016-11-03  7:23 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-03  7:22 [PATCH v2 00/53] Resolve issues for C source codes in BaseTools Hao Wu
2016-11-03  7:22 ` [PATCH v2 01/53] BaseTools/C/Common: Avoid possible NULL pointer dereference Hao Wu
2016-11-03  7:22 ` [PATCH v2 02/53] BaseTools/EfiRom: " Hao Wu
2016-11-03  7:22 ` Hao Wu [this message]
2016-11-03  7:22 ` [PATCH v2 04/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 05/53] BaseTools/GenFw: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 06/53] BaseTools/GenPage: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 07/53] BaseTools/GenSec: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 08/53] BaseTools/GenVtf: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 09/53] BaseTools/TianoCompress: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 10/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 11/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 12/53] BaseTools/TianoCompress: Initialize local variables before being used Hao Wu
2016-11-03  7:22 ` [PATCH v2 13/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 14/53] BaseTools/GenBootSector: Fix parameter format mismatch in printf functions Hao Wu
2016-11-03  7:22 ` [PATCH v2 15/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 16/53] BaseTools/C/Common: Fix parameter format mismatch in scanf functions Hao Wu
2016-11-03  7:22 ` [PATCH v2 17/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 18/53] BaseTools/GenFw: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 19/53] BaseTools/GenVtf: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 20/53] BaseTools/C/Common: Add checks for array access Hao Wu
2016-11-03  7:22 ` [PATCH v2 21/53] BaseTools/TianoCompress: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 22/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 23/53] BaseTools/EfiRom: Add checks for user/file inputs Hao Wu
2016-11-03  7:22 ` [PATCH v2 24/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 25/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 26/53] BaseTools/VfrCompile: Avoid freeing memory with mismatched functions Hao Wu
2016-11-03  7:22 ` [PATCH v2 27/53] BaseTools/VfrCompile: Add assignment operator definition for some classes Hao Wu
2016-11-03  7:22 ` [PATCH v2 28/53] BaseTools/VfrCompile: Avoid freeing freed memory in classes Hao Wu
2016-11-03  7:22 ` [PATCH v2 29/53] BaseTools/VfrCompile: Remove unused local variables Hao Wu
2016-11-03  7:22 ` [PATCH v2 30/53] BaseTools/C/Common: Fix potential memory leak Hao Wu
2016-11-03  7:22 ` [PATCH v2 31/53] BaseTools/EfiRom: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 32/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 33/53] BaseTools/GenPage: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 34/53] BaseTools/GenSec: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 35/53] BaseTools/GenVtf: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 36/53] BaseTools/Split: Fix potential memory and resource leak Hao Wu
2016-11-03  7:22 ` [PATCH v2 37/53] BaseTools/TianoCompress: Fix potential memory leak Hao Wu
2016-11-03  7:22 ` [PATCH v2 38/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 39/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 40/53] BaseTools/EfiRom: Fix file handles not being closed Hao Wu
2016-11-03  7:22 ` [PATCH v2 41/53] BaseTools/GenBootSector: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 42/53] BaseTools/GenCrc32: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 43/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 44/53] BaseTools/GenVtf: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 45/53] BaseTools/LzmaCompress: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 46/53] BaseTools/TianoCompress: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 47/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 48/53] BaseTools/GenVtf: Provide string width in '%s' specifier in format string Hao Wu
2016-11-03  7:22 ` [PATCH v2 49/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:23 ` [PATCH v2 50/53] BaseTools/VfrCompile: Explicitly state format string for DebugMsg() Hao Wu
2016-11-03  7:23 ` [PATCH v2 51/53] BaseTools/VolInfo: Add definitions for command format strings Hao Wu
2016-11-03  7:23 ` [PATCH v2 52/53] BaseTools/VfrCompile/Pccts: Add virtual destructor for class DLGInputStream Hao Wu
2016-11-03  7:23 ` [PATCH v2 53/53] BaseTools/VfrCompile/Pccts: Make assignment operator not returning void Hao Wu
2016-11-08  1:05 ` [PATCH v2 00/53] Resolve issues for C source codes in BaseTools Gao, Liming

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1478157783-9368-4-git-send-email-hao.a.wu@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox