CVS commit: src/dist/bzip2

[Mihai Chelaru]

Module Name:    src
Committed By:   kefren
Date:           Mon Apr  6 19:33:22 UTC 2009

Modified Files:
        src/dist/bzip2: bzip2.c

Log Message:
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.7 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.7
--- src/dist/bzip2/bzip2.c:1.6	Tue Mar 18 17:35:36 2008
+++ src/dist/bzip2/bzip2.c	Mon Apr  6 19:33:22 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzip2.c,v 1.6 2008/03/18 17:35:36 christos Exp $	*/
+/*	$NetBSD: bzip2.c,v 1.7 2009/04/06 19:33:22 kefren 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;