From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 30 Dec 2010 03:43:35 +0000 (+0100)
Subject: bzip2: plug memory leak on every processed file
X-Git-Tag: 1_19_0~428
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ed9b08d1c1bbccd1bcb2c3e06b0095b6b99dc96c;p=oweals%2Fbusybox.git

bzip2: plug memory leak on every processed file

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/bzip2.c b/archival/bzip2.c
index a6abc931c..ab08ffc1a 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA
 			break;
 	}
 
-#if ENABLE_FEATURE_CLEAN_UP
+	/* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
+	 * we are called repeatedly
+	 */
 	BZ2_bzCompressEnd(strm);
 	free(iobuf);
-#endif
+
 	return total;
 }
 
diff --git a/archival/libarchive/bz/bzlib.c b/archival/libarchive/bz/bzlib.c
index b3beeabed..5f7db747a 100644
--- a/archival/libarchive/bz/bzlib.c
+++ b/archival/libarchive/bz/bzlib.c
@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int action)
 
 
 /*---------------------------------------------------*/
-#if ENABLE_FEATURE_CLEAN_UP
 static
 void BZ2_bzCompressEnd(bz_stream *strm)
 {
@@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm)
 	free(s->arr2);
 	free(s->ftab);
 	free(s->crc32table);
-	free(strm->state);
+	free(s);
 }
-#endif
 
 
 /*---------------------------------------------------*/