fix null references introduced while merging bzip2 1.0.5
fixes PR/41032 ok christos@
This commit is contained in:
parent
d595a1c226
commit
430d7ee47c
|
@ -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 @@ Bool uncompressStream ( FILE *zStream, FILE *stream )
|
|||
}
|
||||
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 @@ Bool testStream ( FILE *zStream )
|
|||
}
|
||||
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;
|
||||
|
|
Loading…
Reference in New Issue