diff options
| author |   Eric BENARD <eric@eukrea.com> | 2011-01-01 06:49:02 +0000 |
|---|---|---|
| committer | Eric Bénard <eric@eukrea.com> | 2011-01-01 13:42:08 +0100 |
| commit | fb1fdbfa5ad0e9e0763e68161ba8e12eea4ddbc4 (patch) | |
| tree | 637fb2f973c9083d3ae4b45c6a974690aa1912ff /recipes/busybox | |
| parent | 902e4ecc477f9f9b605568a35858163973da871e (diff) | |
| download | openembedded-fb1fdbfa5ad0e9e0763e68161ba8e12eea4ddbc4.tar.gz | |
busybox-1.18.1: add latest fix
* patch comes from :
http://busybox.net/downloads/fixes-1.18.1/
* original commit in bb's git :
bzip2: plug memory leak on every processed file
Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/busybox')
| -rw-r--r-- | recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch | 40 | ||||
| -rw-r--r-- | recipes/busybox/busybox_1.18.1.bb | 3 |
2 files changed, 42 insertions, 1 deletions
diff --git a/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch new file mode 100644 index 0000000000..cffa194355 --- /dev/null +++ b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch @@ -0,0 +1,40 @@ +diff -urpN busybox-1.18.1/archival/bzip2.c busybox-1.18.1-bzip2/archival/bzip2.c +--- busybox-1.18.1/archival/bzip2.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1-bzip2/archival/bzip2.c 2010-12-30 04:43:11.000000000 +0100 +@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC comp + 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 -urpN busybox-1.18.1/archival/libarchive/bz/bzlib.c busybox-1.18.1-bzip2/archival/libarchive/bz/bzlib.c +--- busybox-1.18.1/archival/libarchive/bz/bzlib.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1-bzip2/archival/libarchive/bz/bzlib.c 2010-12-30 04:43:11.000000000 +0100 +@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int + + + /*---------------------------------------------------*/ +-#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 + + + /*---------------------------------------------------*/ diff --git a/recipes/busybox/busybox_1.18.1.bb b/recipes/busybox/busybox_1.18.1.bb index 8fe121029b..e41f46da83 100644 --- a/recipes/busybox/busybox_1.18.1.bb +++ b/recipes/busybox/busybox_1.18.1.bb @@ -1,11 +1,12 @@ require busybox_1.1x.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" SRC_URI += " \ file://busybox-1.18.1-hush.patch \ file://busybox-1.18.1-cpio.patch \ + file://busybox-1.18.1-bzip2.patch \ " SRC_URI[md5sum] = "f15fe752d8b7012aa5e59f83b88ccb1c" |