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 0600A1A1E30 for ; Wed, 12 Oct 2016 05:21:53 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 12 Oct 2016 05:21:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,482,1473145200"; d="scan'208";a="1063788857" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.34]) by orsmga002.jf.intel.com with ESMTP; 12 Oct 2016 05:21:51 -0700 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Liming Gao , Yonghong Zhu Date: Wed, 12 Oct 2016 20:20:18 +0800 Message-Id: <1476274836-10544-35-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 34/52] BaseTools/GenVtf: Fix potential memory leak 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:53 -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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c index 8e75d04..392e4e0 100644 --- a/BaseTools/Source/C/GenVtf/GenVtf.c +++ b/BaseTools/Source/C/GenVtf/GenVtf.c @@ -1232,11 +1232,13 @@ Returns: Vtf1TotalSize += (UINT32) (FileSize + NumAdjustByte); Status = UpdateVtfBuffer (CompStartAddress, Buffer, FileSize, FIRST_VTF); } else { + free (Buffer); Error (NULL, 0, 2000,"Invalid Parameter", "There's component in second VTF so second BaseAddress and Size must be specified!"); return EFI_INVALID_PARAMETER; } if (EFI_ERROR (Status)) { + free (Buffer); return EFI_ABORTED; } @@ -1248,6 +1250,7 @@ Returns: CompFitPtr->CompAddress = CompStartAddress | IPF_CACHE_BIT; if ((FileSize % 16) != 0) { + free (Buffer); Error (NULL, 0, 2000, "Invalid parameter", "Binary FileSize must be a multiple of 16."); return EFI_INVALID_PARAMETER; } @@ -1389,6 +1392,7 @@ Returns: PalFitPtr->CompAddress = PalStartAddress | IPF_CACHE_BIT; //assert ((FileSize % 16) == 0); if ((FileSize % 16) != 0) { + free (Buffer); Error (NULL, 0, 2000, "Invalid parameter", "Binary FileSize must be a multiple of 16."); return EFI_INVALID_PARAMETER; } -- 1.9.5.msysgit.0