CVS commit: [netbsd-5] src/dist/bzip2

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Wed Apr  8 00:06:09 UTC 2009

Modified Files:
        src/dist/bzip2 [netbsd-5]: bzip2.c

Log Message:
Pull up following revision(s) (requested by kefren in ticket #676):
        dist/bzip2/bzip2.c: revision 1.7
fix null references introduced while merging bzip2 1.0.5
fixes PR/41032
ok christos@


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.8.1 src/dist/bzip2/bzip2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/dist/bzip2/bzip2.c
diff -u src/dist/bzip2/bzip2.c:1.6 src/dist/bzip2/bzip2.c:1.6.8.1
--- src/dist/bzip2/bzip2.c:1.6	Tue Mar 18 17:35:36 2008
+++ src/dist/bzip2/bzip2.c	Wed Apr  8 00:06:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzip2.c,v 1.6 2008/03/18 17:35:36 christos Exp $	*/
+/*	$NetBSD: bzip2.c,v 1.6.8.1 2009/04/08 00:06:09 snj Exp $	*/
 
 
 /*-----------------------------------------------------------*/
@@ -470,7 +470,7 @@
       }
       if (bzerr != BZ_STREAM_END) goto errhandler;
 
-      BZ2_bzReadGetUnused ( &bzerr, bzf, (void*)(&unusedTmp), &nUnused );
+      BZ2_bzReadGetUnused ( &bzerr, bzf, (void*)(&unusedTmpV), &nUnused );
       if (bzerr != BZ_OK) panic ( "decompress:bzReadGetUnused" );
 
       unusedTmp = (UChar*)unusedTmpV;
@@ -585,7 +585,7 @@
       }
       if (bzerr != BZ_STREAM_END) goto errhandler;
 
-      BZ2_bzReadGetUnused ( &bzerr, bzf, (void*)(&unusedTmp), &nUnused );
+      BZ2_bzReadGetUnused ( &bzerr, bzf, (void*)(&unusedTmpV), &nUnused );
       if (bzerr != BZ_OK) panic ( "test:bzReadGetUnused" );
 
       unusedTmp = (UChar*)unusedTmpV;