Skip to content
This repository was archived by the owner on Jan 26, 2026. It is now read-only.

Commit c559e20

Browse files
SibrasSibras
committed
Merge commit 'f319b98aade2a337c74b9a3b48c6daffb7809cda'
2 parents 1f190e0 + f319b98 commit c559e20

36 files changed

+558
-412
lines changed

‎CHANGES‎

Lines changed: 15 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.7 of 27 June 2019
6+
Copyright (C) 1996-2010 Julian Seward <jseward@acm.org>
77

88
Please read the WARNING, DISCLAIMER and PATENTS sections in the
99
README file.
@@ -325,3 +325,16 @@ 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)

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.7 of 27 June 2019
4141

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

‎Makefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# lossless, block-sorting data compression.
44
#
55
# bzip2/libbzip2 version 1.0.6 of 6 September 2010
6-
# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
6+
# Copyright (C) 1996-2010 Julian Seward <jseward@acm.org>
77
#
88
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
99
# README file.
@@ -79,6 +79,10 @@ install: bzip2 bzip2recover
7979
cp -f bzip2 $(PREFIX)/bin/bunzip2
8080
cp -f bzip2 $(PREFIX)/bin/bzcat
8181
cp -f bzip2recover $(PREFIX)/bin/bzip2recover
82+
chmod a+x $(PREFIX)/bin/bzip2
83+
chmod a+x $(PREFIX)/bin/bunzip2
84+
chmod a+x $(PREFIX)/bin/bzcat
85+
chmod a+x $(PREFIX)/bin/bzip2recover
8286
cp -f bzip2.1 $(PREFIX)/man/man1
8387
chmod a+r $(PREFIX)/man/man1/bzip2.1
8488
cp -f bzlib.h $(PREFIX)/include
@@ -133,7 +137,7 @@ bzip2recover.o: bzip2recover.c
133137
distclean: clean
134138
rm -f manual.ps manual.html manual.pdf
135139

136-
DISTNAME=bzip2-1.0.6
140+
DISTNAME=bzip2-1.0.7
137141
dist: check manual
138142
rm -f $(DISTNAME)
139143
ln -s -f . $(DISTNAME)

‎Makefile-libbz2_so‎

Lines changed: 6 additions & 32 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.7, 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
@@ -11,7 +11,7 @@
1111
# lossless, block-sorting data compression.
1212
#
1313
# bzip2/libbzip2 version 1.0.6 of 6 September 2010
14-
# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
14+
# Copyright (C) 1996-2010 Julian Seward <jseward@acm.org>
1515
#
1616
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
1717
# README file.
@@ -26,10 +26,6 @@ CC=gcc
2626
BIGFILES=-D_FILE_OFFSET_BITS=64
2727
CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
2828

29-
# Where you want it installed when you do 'make install'
30-
PREFIX=/usr/local
31-
32-
3329
OBJS= blocksort.o \
3430
huffman.o \
3531
crctable.o \
@@ -39,34 +35,13 @@ OBJS= blocksort.o \
3935
bzlib.o
4036

4137
all: $(OBJS)
42-
$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
43-
$(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.7 $(OBJS)
39+
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
4440
rm -f libbz2.so.1.0
45-
ln -s libbz2.so.1.0.6 libbz2.so.1.0
41+
ln -s libbz2.so.1.0.7 libbz2.so.1.0
4642

47-
install: all
48-
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
49-
if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
50-
if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
51-
if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
52-
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
53-
cp -f bzip2.1 $(PREFIX)/man/man1
54-
chmod a+r $(PREFIX)/man/man1/bzip2.1
55-
cp -f bzlib.h $(PREFIX)/include
56-
chmod a+r $(PREFIX)/include/bzlib.h
57-
cp -f libbz2.so.1.0 $(PREFIX)/bin/libbz2.so
58-
chmod a+r $(PREFIX)/bin/libbz2.so
59-
cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
60-
chmod a+r $(PREFIX)/man/man1/bzgrep.1
61-
chmod a+r $(PREFIX)/man/man1/bzmore.1
62-
chmod a+r $(PREFIX)/man/man1/bzdiff.1
63-
echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
64-
echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
65-
echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
66-
echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
67-
6843
clean:
69-
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.7 libbz2.so.1.0 bzip2-shared
7045

7146
blocksort.o: blocksort.c
7247
$(CC) $(CFLAGS) -c blocksort.c
@@ -82,4 +57,3 @@ decompress.o: decompress.c
8257
$(CC) $(CFLAGS) -c decompress.c
8358
bzlib.o: bzlib.c
8459
$(CC) $(CFLAGS) -c bzlib.c
85-

‎README‎

Lines changed: 8 additions & 28 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.7 of 27 June 2019
10+
Copyright (C) 1996-2010 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-
189168
I hope you find bzip2 useful. Feel free to contact me at
190-
jseward@bzip.org
169+
jseward@acm.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,4 @@ 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)

‎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.7 of 27 June 2019
6+
Copyright (C) 1996-2010 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.7 of 27 June 2019
6+
Copyright (C) 1996-2010 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.7 of 27 June 2019
12+
Copyright (C) 1996-2010 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

‎bz-html.xsl‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
88
<xsl:import href="bz-common.xsl"/>
99

10-
<!-- use 8859-1 encoding -->
11-
<xsl:output method="html" encoding="ISO-8859-1" indent="yes"/>
10+
<!-- use UTF-8 encoding -->
11+
<xsl:output method="html" encoding="UTF-8" indent="yes"/>
1212

13-
<!-- we include the css directly when generating one large file -->
14-
<xsl:template name="user.head.content">
13+
<!-- we include the css as link and directly when generating one large file -->
14+
<xsl:template name="user.head.content">
15+
<xsl:text disable-output-escaping="yes">
16+
<![CDATA[<]]>link rel="stylesheet" type="text/css" href="bzip.css" />
17+
</xsl:text>
1518
<style type="text/css" media="screen">
1619
<xsl:text>&bz-css;</xsl:text>
1720
</style>

‎bzip.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dd {
2525
/* -- ruler -- */
2626
div.hr_blue {
2727
height: 3px;
28-
background:#ffffff url("/images/hr_blue.png") repeat-x; }
28+
background:#ffffff url("../images/hr_blue.png") repeat-x; }
2929
div.hr_blue hr { display:none; }
3030

3131
/* release styles */
@@ -38,7 +38,7 @@ div.hr_blue hr { display:none; }
3838
ul {
3939
margin: 0px 4px 16px 16px;
4040
padding: 0px;
41-
list-style: url("/images/li-blue.png");
41+
list-style: url("../images/li-blue.png");
4242
}
4343
ul li {
4444
margin-bottom: 10px;

0 commit comments

Comments
 (0)