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 D76B01A1F49 for ; Wed, 12 Oct 2016 05:22:05 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 12 Oct 2016 05:22:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,482,1473145200"; d="scan'208";a="1063788971" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.34]) by orsmga002.jf.intel.com with ESMTP; 12 Oct 2016 05:22:04 -0700 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Liming Gao , Yonghong Zhu Date: Wed, 12 Oct 2016 20:20:27 +0800 Message-Id: <1476274836-10544-44-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 43/52] BaseTools/GenVtf: Fix file handles not being closed 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:22:06 -0000 Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- BaseTools/Source/C/GenVtf/GenVtf.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c index 392e4e0..85c771d 100644 --- a/BaseTools/Source/C/GenVtf/GenVtf.c +++ b/BaseTools/Source/C/GenVtf/GenVtf.c @@ -1164,6 +1164,7 @@ Returns: if (VtfInfo->PreferredSize) { if (FileSize > VtfInfo->CompSize) { + fclose (Fp); Error (NULL, 0, 2000, "Invalid parameter", "The component size is more than specified size."); return EFI_ABORTED; } @@ -1173,6 +1174,7 @@ Returns: Buffer = malloc ((UINTN) FileSize); if (Buffer == NULL) { + fclose (Fp); return EFI_OUT_OF_RESOURCES; } memset (Buffer, 0, (UINTN) FileSize); @@ -1342,6 +1344,7 @@ Returns: FileSize = _filelength (fileno (Fp)); if (FileSize < 64) { + fclose (Fp); Error (NULL, 0, 2000, "Invalid parameter", "PAL_A bin header is 64 bytes, so the Bin size must be larger than 64 bytes!"); return EFI_INVALID_PARAMETER; } @@ -1350,6 +1353,7 @@ Returns: if (VtfInfo->PreferredSize) { if (FileSize > VtfInfo->CompSize) { + fclose (Fp); Error (NULL, 0, 2000, "Invalid parameter", "The PAL_A Size is more than the specified size."); return EFI_ABORTED; } @@ -1359,6 +1363,7 @@ Returns: Buffer = malloc ((UINTN) FileSize); if (Buffer == NULL) { + fclose (Fp); return EFI_OUT_OF_RESOURCES; } memset (Buffer, 0, (UINTN) FileSize); @@ -1775,11 +1780,13 @@ Returns: FileSize = _filelength (fileno (Fp)); if (FileSize > 16) { + fclose (Fp); return EFI_ABORTED; } Buffer = malloc (FileSize); if (Buffer == NULL) { + fclose (Fp); return EFI_OUT_OF_RESOURCES; } @@ -2548,6 +2555,12 @@ Returns: // Get the input VTF file name // VtfFileName = argv[Index+1]; + if (VtfFP != NULL) { + // + // VTF file name has been given previously, override with the new value + // + fclose (VtfFP); + } VtfFP = fopen (LongFilePath (VtfFileName), "rb"); if (VtfFP == NULL) { Error (NULL, 0, 0001, "Error opening file", VtfFileName); -- 1.9.5.msysgit.0