From 592a1cf2aec9b5dc3086f76c7d1b8b3dac961a2e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 26 Dec 2004 21:48:30 +0000
Subject: Add a NULL-ptr check fix by Mihai Limbasan #75305.

---
 app-arch/bzip2/files/1.0.2-NULL-ptr-check.patch  | 27 ++++++++++++++++++++++++
 app-arch/bzip2/files/1.0.2-makefile-CFLAGS.patch | 22 +++++++++++++++++++
 app-arch/bzip2/files/digest-bzip2-1.0.2-r4       |  1 +
 3 files changed, 50 insertions(+)
 create mode 100644 app-arch/bzip2/files/1.0.2-NULL-ptr-check.patch
 create mode 100644 app-arch/bzip2/files/1.0.2-makefile-CFLAGS.patch
 create mode 100644 app-arch/bzip2/files/digest-bzip2-1.0.2-r4

(limited to 'app-arch/bzip2/files')

diff --git a/app-arch/bzip2/files/1.0.2-NULL-ptr-check.patch b/app-arch/bzip2/files/1.0.2-NULL-ptr-check.patch
new file mode 100644
index 000000000000..e35080f86db8
--- /dev/null
+++ b/app-arch/bzip2/files/1.0.2-NULL-ptr-check.patch
@@ -0,0 +1,27 @@
+Mihai Limbasan writes:
+BZ2_bzclose fails to perform a NULL pointer check before actually
+using the passed BZFILE * argument. The NULL check *is* performed but
+only after the argument is used for the first time, resulting in a
+potential NULL pointer dereference.
+
+http://bugs.gentoo.org/show_bug.cgi?id=75305
+
+Sent upstream but no feedback thus far :(
+diff -Naur bzip2-1.0.2-orig/bzlib.c bzip2-1.0.2/bzlib.c
+--- bzip2-1.0.2-orig/bzlib.c	2002-01-05 02:48:41.000000000 +0200
++++ bzip2-1.0.2/bzlib.c	2004-12-22 15:12:52.824593032 +0200
+@@ -1536,9 +1536,12 @@
+ void BZ_API(BZ2_bzclose) (BZFILE* b)
+ {
+    int bzerr;
+-   FILE *fp = ((bzFile *)b)->handle;
+-   
++   FILE *fp;
++
+    if (b==NULL) {return;}
++
++   fp = ((bzFile *)b)->handle;
++
+    if(((bzFile*)b)->writing){
+       BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
+       if(bzerr != BZ_OK){
diff --git a/app-arch/bzip2/files/1.0.2-makefile-CFLAGS.patch b/app-arch/bzip2/files/1.0.2-makefile-CFLAGS.patch
new file mode 100644
index 000000000000..bf7d430f9496
--- /dev/null
+++ b/app-arch/bzip2/files/1.0.2-makefile-CFLAGS.patch
@@ -0,0 +1,22 @@
+--- Makefile.orig	2004-12-26 16:30:06.354116536 -0500
++++ Makefile	2004-12-26 16:32:13.617769520 -0500
+@@ -9,7 +9,7 @@
+ 
+ # Suitably paranoid flags to avoid bugs in gcc-2.7
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++CFLAGS+=-Wall -Winline -fno-strength-reduce $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr
+--- Makefile-libbz2_so.orig	2004-12-26 16:32:23.972195408 -0500
++++ Makefile-libbz2_so	2004-12-26 16:32:34.835543928 -0500
+@@ -9,7 +9,7 @@
+ SHELL=/bin/sh
+ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++CFLAGS+=-fpic -fPIC -Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
diff --git a/app-arch/bzip2/files/digest-bzip2-1.0.2-r4 b/app-arch/bzip2/files/digest-bzip2-1.0.2-r4
new file mode 100644
index 000000000000..5b1f375c39ee
--- /dev/null
+++ b/app-arch/bzip2/files/digest-bzip2-1.0.2-r4
@@ -0,0 +1 @@
+MD5 ee76864958d568677f03db8afad92beb bzip2-1.0.2.tar.gz 665198
-- 
cgit v1.2.3-65-gdbad