drop patches, applied upstream
Daniel Kahn Gillmor
2 years ago
debian/patches/0001-Propagate-CC-from-.-configure-to-facilitate-cross-bu.patch
less
more
0 | |
From: Helmut Grohne <helmut@subdivi.de>
|
1 | |
Date: Wed, 13 Jun 2018 13:12:45 -0400
|
2 | |
Subject: Propagate CC from ./configure to facilitate cross-building
|
3 | |
|
4 | |
See https://bugs.debian.org/894115 for more discussion.
|
5 | |
|
6 | |
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
7 | |
---
|
8 | |
Makefile.in | 1 +
|
9 | |
1 file changed, 1 insertion(+)
|
10 | |
|
11 | |
diff --git a/Makefile.in b/Makefile.in
|
12 | |
index f9bff30..94bc1a5 100644
|
13 | |
--- a/Makefile.in
|
14 | |
+++ b/Makefile.in
|
15 | |
@@ -5,6 +5,7 @@ mandir = @mandir@
|
16 | |
LIBS = @LIBS@
|
17 | |
CFLAGS = @CFLAGS@ -O -Wall
|
18 | |
LDFLAGS = @LDFLAGS@
|
19 | |
+CC = @CC@
|
20 | |
VERSION = `git tag | tail -1 | sed -e 's/v//'`
|
21 | |
|
22 | |
RM = rm -f
|
debian/patches/0002-Avoid-infinite-loop-when-invoking-BZ2_bzDecompress.patch
less
more
0 | |
From: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
|
1 | |
Date: Wed, 13 Jun 2018 13:21:59 -0400
|
2 | |
Subject: Avoid infinite loop when invoking BZ2_bzDecompress
|
3 | |
|
4 | |
This corner case was found with afl.
|
5 | |
|
6 | |
See https://bugs.debian.org/869891 for more discussion.
|
7 | |
|
8 | |
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
9 | |
---
|
10 | |
buffer.c | 2 ++
|
11 | |
1 file changed, 2 insertions(+)
|
12 | |
|
13 | |
diff --git a/buffer.c b/buffer.c
|
14 | |
index 95e60fa..35f66c9 100644
|
15 | |
--- a/buffer.c
|
16 | |
+++ b/buffer.c
|
17 | |
@@ -276,6 +276,8 @@ inflate_bzip2(byte *p, unsigned int max)
|
18 | |
while (bz.avail_out != 0) {
|
19 | |
if (bz.avail_in == 0) {
|
20 | |
size = (*d_func2)(d_buf2, sizeof(d_buf2));
|
21 | |
+ if (size == 0)
|
22 | |
+ warn_exit("bzip2 no data for BZ2_bzDecompress");
|
23 | |
bz.next_in = (cast_t)d_buf2;
|
24 | |
bz.avail_in = size;
|
25 | |
}
|
0 | |
0001-Propagate-CC-from-.-configure-to-facilitate-cross-bu.patch
|
1 | |
0002-Avoid-infinite-loop-when-invoking-BZ2_bzDecompress.patch
|