Skip to content

Commit 1c34e31

Browse files
jcfrjcfr
committed
Integrate changes associated with version 1.0.7 and 1.0.8
Files synced with tagged version bzip2-1.0.8 downloaded from https://sourceware.org/git/bzip2.git 1.0.7 (27 Jun 19) ~~~~~~~~~~~~~~~~~ * Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH * bzip2: Fix return value when combining --test,-t and -q. * bzip2recover: Fix buffer overflow for large argv[0] * bzip2recover: Fix use after free issue with outFile (CVE-2016-3189) * Make sure nSelectors is not out of range (CVE-2019-12900) 1.0.8 (13 Jul 19) ~~~~~~~~~~~~~~~~~ * Accept as many selectors as the file format allows. This relaxes the fix for CVE-2019-12900 from 1.0.7 so that bzip2 allows decompression of bz2 files that use (too) many selectors again. * Fix handling of large (> 4GB) files on Windows. * Cleanup of bzdiff and bzgrep scripts so they don't use any bash extensions and handle multiple archives correctly. * There is now a bz2-files testsuite at https://sourceware.org/git/bzip2-tests.git
1 parent 0e735f2 commit 1c34e31

40 files changed

Lines changed: 369 additions & 2693 deletions

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.ref binary

‎.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
*.o
2+
*.obj
3+
*.rb2
4+
*.tst
5+
*.a
6+
*.lib
7+
*.exe
8+
bzip2
9+
bzip2recover

‎CHANGES‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
This file is part of bzip2/libbzip2, a program and library for
33
lossless, block-sorting data compression.
44

5-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
6-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
5+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
6+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
77

88
Please read the WARNING, DISCLAIMER and PATENTS sections in the
99
README file.
@@ -325,3 +325,32 @@ Security fix only. Fixes CERT-FI 20469 as it applies to bzip2.
325325
Izdebski.
326326

327327
* Make the documentation build on Ubuntu 10.04
328+
329+
1.0.7 (27 Jun 19)
330+
~~~~~~~~~~~~~~~~~
331+
332+
* Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH
333+
334+
* bzip2: Fix return value when combining --test,-t and -q.
335+
336+
* bzip2recover: Fix buffer overflow for large argv[0]
337+
338+
* bzip2recover: Fix use after free issue with outFile (CVE-2016-3189)
339+
340+
* Make sure nSelectors is not out of range (CVE-2019-12900)
341+
342+
1.0.8 (13 Jul 19)
343+
~~~~~~~~~~~~~~~~~
344+
345+
* Accept as many selectors as the file format allows.
346+
This relaxes the fix for CVE-2019-12900 from 1.0.7
347+
so that bzip2 allows decompression of bz2 files that
348+
use (too) many selectors again.
349+
350+
* Fix handling of large (> 4GB) files on Windows.
351+
352+
* Cleanup of bzdiff and bzgrep scripts so they don't use
353+
any bash extensions and handle multiple archives correctly.
354+
355+
* There is now a bz2-files testsuite at
356+
https://sourceware.org/git/bzip2-tests.git

‎LICENSE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
--------------------------------------------------------------------------
33

44
This program, "bzip2", the associated library "libbzip2", and all
5-
documentation, are copyright (C) 1996-2010 Julian R Seward. All
5+
documentation, are copyright (C) 1996-2019 Julian R Seward. All
66
rights reserved.
77

88
Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
3636
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3737
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3838

39-
Julian Seward, jseward@bzip.org
40-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
39+
Julian Seward, jseward@acm.org
40+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
4141

4242
--------------------------------------------------------------------------

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# This file is part of bzip2/libbzip2, a program and library for
33
# lossless, block-sorting data compression.
44
#
5-
# bzip2/libbzip2 version 1.0.6 of 6 September 2010
6-
# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
5+
# bzip2/libbzip2 version 1.0.8 of 13 July 2019
6+
# Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
77
#
88
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
99
# README file.
@@ -137,7 +137,7 @@ bzip2recover.o: bzip2recover.c
137137
distclean: clean
138138
rm -f manual.ps manual.html manual.pdf
139139

140-
DISTNAME=bzip2-1.0.6
140+
DISTNAME=bzip2-1.0.8
141141
dist: check manual
142142
rm -f $(DISTNAME)
143143
ln -s -f . $(DISTNAME)

‎Makefile-libbz2_so‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# This Makefile builds a shared version of the library,
3-
# libbz2.so.1.0.6, with soname libbz2.so.1.0,
3+
# libbz2.so.1.0.8, with soname libbz2.so.1.0,
44
# at least on x86-Linux (RedHat 7.2),
55
# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).
66
# Please see the README file for some important info
@@ -10,8 +10,8 @@
1010
# This file is part of bzip2/libbzip2, a program and library for
1111
# lossless, block-sorting data compression.
1212
#
13-
# bzip2/libbzip2 version 1.0.6 of 6 September 2010
14-
# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
13+
# bzip2/libbzip2 version 1.0.8 of 13 July 2019
14+
# Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1515
#
1616
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
1717
# README file.
@@ -35,13 +35,13 @@ OBJS= blocksort.o \
3535
bzlib.o
3636

3737
all: $(OBJS)
38-
$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
39-
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
38+
$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
39+
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
4040
rm -f libbz2.so.1.0
41-
ln -s libbz2.so.1.0.6 libbz2.so.1.0
41+
ln -s libbz2.so.1.0.8 libbz2.so.1.0
4242

4343
clean:
44-
rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
44+
rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
4545

4646
blocksort.o: blocksort.c
4747
$(CC) $(CFLAGS) -c blocksort.c

‎README‎

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This version is fully compatible with the previous public releases.
66
This file is part of bzip2/libbzip2, a program and library for
77
lossless, block-sorting data compression.
88

9-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
10-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
9+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
10+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1111

1212
Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
1313

@@ -73,7 +73,7 @@ HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
7373

7474
It's difficult for me to support compilation on all these platforms.
7575
My approach is to collect binaries for these platforms, and put them
76-
on the master web site (http://www.bzip.org). Look there. However
76+
on the master web site (https://sourceware.org/bzip2/). Look there. However
7777
(FWIW), bzip2-1.0.X is very standard ANSI C and should compile
7878
unmodified with MS Visual C. If you have difficulties building, you
7979
might want to read README.COMPILATION.PROBLEMS.
@@ -161,43 +161,22 @@ WHAT'S NEW IN 0.9.5 ?
161161
* Many small improvements in file and flag handling.
162162
* A Y2K statement.
163163

164-
WHAT'S NEW IN 1.0.0 ?
164+
WHAT'S NEW IN 1.0.x ?
165165

166166
See the CHANGES file.
167167

168-
WHAT'S NEW IN 1.0.2 ?
169-
170-
See the CHANGES file.
171-
172-
WHAT'S NEW IN 1.0.3 ?
173-
174-
See the CHANGES file.
175-
176-
WHAT'S NEW IN 1.0.4 ?
177-
178-
See the CHANGES file.
179-
180-
WHAT'S NEW IN 1.0.5 ?
181-
182-
See the CHANGES file.
183-
184-
WHAT'S NEW IN 1.0.6 ?
185-
186-
See the CHANGES file.
187-
188-
189-
I hope you find bzip2 useful. Feel free to contact me at
190-
jseward@bzip.org
168+
I hope you find bzip2 useful. Feel free to contact the developers at
169+
bzip2-devel@sourceware.org
191170
if you have any suggestions or queries. Many people mailed me with
192171
comments, suggestions and patches after the releases of bzip-0.15,
193172
bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
194173
1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
195174
feedback. I thank you for your comments.
196175

197-
bzip2's "home" is http://www.bzip.org/
176+
bzip2's "home" is https://sourceware.org/bzip2/
198177

199178
Julian Seward
200-
jseward@bzip.org
179+
jseward@acm.org
201180
Cambridge, UK.
202181

203182
18 July 1996 (version 0.15)
@@ -213,3 +192,5 @@ Cambridge, UK.
213192
20 December 2006 (bzip2, version 1.0.4)
214193
10 December 2007 (bzip2, version 1.0.5)
215194
6 Sept 2010 (bzip2, version 1.0.6)
195+
27 June 2019 (bzip2, version 1.0.7)
196+
13 July 2019 (bzip2, version 1.0.8)

‎README.COMPILATION.PROBLEMS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
This file is part of bzip2/libbzip2, a program and library for
33
lossless, block-sorting data compression.
44

5-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
6-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
5+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
6+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
77

88
Please read the WARNING, DISCLAIMER and PATENTS sections in the
99
README file.
@@ -12,7 +12,7 @@ This program is released under the terms of the license contained
1212
in the file LICENSE.
1313
------------------------------------------------------------------
1414

15-
bzip2-1.0.6 should compile without problems on the vast majority of
15+
bzip2 should compile without problems on the vast majority of
1616
platforms. Using the supplied Makefile, I've built and tested it
1717
myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
1818
6.0 and nmake, you can build a native Win32 version too. Large file

‎README.XML.STUFF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
This file is part of bzip2/libbzip2, a program and library for
33
lossless, block-sorting data compression.
44

5-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
6-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
5+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
6+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
77

88
Please read the WARNING, DISCLAIMER and PATENTS sections in the
99
README file.

‎blocksort.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.
@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
202202
bhtab [ 0 .. 2+(nblock/32) ] destroyed
203203
*/
204204

205-
#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
206-
#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
207-
#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
205+
#define SET_BH(zz) bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31))
206+
#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31))
207+
#define ISSET_BH(zz) (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31)))
208208
#define WORD_BH(zz) bhtab[(zz) >> 5]
209209
#define UNALIGNED_BH(zz) ((zz) & 0x01f)
210210

0 commit comments

Comments
 (0)