[src/netbsd-3-0]: src/dist/bzip2 Pull up following revision(s) (requested by ...

[ghen <ghen%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d4325b544d9
branches:  netbsd-3-0
changeset: 579377:2d4325b544d9
user:      ghen <ghen%NetBSD.org@localhost>
date:      Mon Jan 29 09:23:18 2007 +0000

description:
Pull up following revision(s) (requested by adrianp in ticket #1658):
        dist/bzip2/bzlib.c: revision 1.3
Only dereference b after it has been NULL checked.
Coverity CID 2398.

diffstat:

 dist/bzip2/bzlib.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r fc8c1fc395b0 -r 2d4325b544d9 dist/bzip2/bzlib.c
--- a/dist/bzip2/bzlib.c        Sun Jan 28 19:39:40 2007 +0000
+++ b/dist/bzip2/bzlib.c        Mon Jan 29 09:23:18 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bzlib.c,v 1.1.1.2 2002/03/15 01:35:26 mjl Exp $        */
+/*     $NetBSD: bzlib.c,v 1.1.1.2.12.1 2007/01/29 09:23:18 ghen Exp $  */
 
 
 /*-------------------------------------------------------------*/
@@ -1538,9 +1538,10 @@
 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){