From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F2EB181D73 for ; Thu, 3 Nov 2016 00:23:56 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 03 Nov 2016 00:23:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,585,1473145200"; d="scan'208";a="897185205" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.34]) by orsmga003.jf.intel.com with ESMTP; 03 Nov 2016 00:23:57 -0700 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Liming Gao , Yonghong Zhu Date: Thu, 3 Nov 2016 15:22:40 +0800 Message-Id: <1478157783-9368-31-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1478157783-9368-1-git-send-email-hao.a.wu@intel.com> References: <1478157783-9368-1-git-send-email-hao.a.wu@intel.com> Subject: [PATCH v2 30/53] BaseTools/C/Common: 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: Thu, 03 Nov 2016 07:23:57 -0000 Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- BaseTools/Source/C/Common/Decompress.c | 34 ++++++++++++++++------ BaseTools/Source/C/Common/FirmwareVolumeBuffer.c | 1 + BaseTools/Source/C/Common/MemoryFile.c | 3 +- .../Source/C/Common/ParseGuidedSectionTools.c | 6 ++++ 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/BaseTools/Source/C/Common/Decompress.c b/BaseTools/Source/C/Common/Decompress.c index 77df89f..4b83e88 100644 --- a/BaseTools/Source/C/Common/Decompress.c +++ b/BaseTools/Source/C/Common/Decompress.c @@ -934,7 +934,9 @@ Extract ( UINT32 ScratchSize; EFI_STATUS Status; - Status = EFI_SUCCESS; + Scratch = NULL; + Status = EFI_SUCCESS; + switch (Algorithm) { case 0: *Destination = (VOID *)malloc(SrcSize); @@ -948,30 +950,44 @@ Extract ( Status = EfiGetInfo(Source, SrcSize, DstSize, &ScratchSize); if (Status == EFI_SUCCESS) { Scratch = (VOID *)malloc(ScratchSize); + if (Scratch == NULL) { + return EFI_OUT_OF_RESOURCES; + } + *Destination = (VOID *)malloc(*DstSize); - if (Scratch != NULL && *Destination != NULL) { - Status = EfiDecompress(Source, SrcSize, *Destination, *DstSize, Scratch, ScratchSize); - } else { - Status = EFI_OUT_OF_RESOURCES; + if (*Destination == NULL) { + free (Scratch); + return EFI_OUT_OF_RESOURCES; } + + Status = EfiDecompress(Source, SrcSize, *Destination, *DstSize, Scratch, ScratchSize); } break; case 2: Status = TianoGetInfo(Source, SrcSize, DstSize, &ScratchSize); if (Status == EFI_SUCCESS) { Scratch = (VOID *)malloc(ScratchSize); + if (Scratch == NULL) { + return EFI_OUT_OF_RESOURCES; + } + *Destination = (VOID *)malloc(*DstSize); - if (Scratch != NULL && *Destination != NULL) { - Status = TianoDecompress(Source, SrcSize, *Destination, *DstSize, Scratch, ScratchSize); - } else { - Status = EFI_OUT_OF_RESOURCES; + if (*Destination == NULL) { + free (Scratch); + return EFI_OUT_OF_RESOURCES; } + + Status = TianoDecompress(Source, SrcSize, *Destination, *DstSize, Scratch, ScratchSize); } break; default: Status = EFI_INVALID_PARAMETER; } + if (Scratch != NULL) { + free (Scratch); + } + return Status; } diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c index a287fe1..d4a6353 100644 --- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c +++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c @@ -186,6 +186,7 @@ Returns: Status = FvBufClearAllFiles (TempFv); if (EFI_ERROR (Status)) { + CommonLibBinderFree (TempFv); return Status; } diff --git a/BaseTools/Source/C/Common/MemoryFile.c b/BaseTools/Source/C/Common/MemoryFile.c index 00ea0c6..1d90688 100644 --- a/BaseTools/Source/C/Common/MemoryFile.c +++ b/BaseTools/Source/C/Common/MemoryFile.c @@ -1,7 +1,7 @@ /** @file This contains some useful functions for accessing files. -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 @@ -69,6 +69,7 @@ Returns: NewMemoryFile = malloc (sizeof (*NewMemoryFile)); if (NewMemoryFile == NULL) { + free (InputFileImage); return EFI_OUT_OF_RESOURCES; } diff --git a/BaseTools/Source/C/Common/ParseGuidedSectionTools.c b/BaseTools/Source/C/Common/ParseGuidedSectionTools.c index fc8f488..115cfa4 100644 --- a/BaseTools/Source/C/Common/ParseGuidedSectionTools.c +++ b/BaseTools/Source/C/Common/ParseGuidedSectionTools.c @@ -125,10 +125,12 @@ Returns: Status = StripInfDscStringInPlace (NextLine); if (EFI_ERROR (Status)) { + free (NextLine); break; } if (NextLine[0] == '\0') { + free (NextLine); continue; } @@ -153,8 +155,12 @@ Returns: LastGuidTool = NewGuidTool; } } + } + + if (Tool != NULL) { FreeStringList (Tool); } + free (NextLine); } return FirstGuidTool; -- 1.9.5.msysgit.0