Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove ambiguity in evaluation of conditional expressions and avoid

Browse Source 
double fclose().
coverity 2713 / run 6
This commit is contained in:
rtr 2006-03-19 04:34:19 +00:00
parent def2a8d763
commit d9da031351
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/vi/ex/ex_read.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ex_read.c,v 1.13 2005/06/02 04:25:16 lukem Exp $ */
/* $NetBSD: ex_read.c,v 1.14 2006/03/19 04:34:19 rtr Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@ -16,7 +16,7 @@
#if 0
static const char sccsid[] = "@(#)ex_read.c 10.38 (Berkeley) 8/12/96";
#else
__RCSID("$NetBSD: ex_read.c,v 1.13 2005/06/02 04:25:16 lukem Exp $");
__RCSID("$NetBSD: ex_read.c,v 1.14 2006/03/19 04:34:19 rtr Exp $");
#endif
#endif /* not lint */
@ -342,9 +342,14 @@ ex_readfp(sp, name, fp, fm, nlinesp, silent)
ccnt += len;
}
if (ferror(fp) || fclose(fp))
if (ferror(fp))
goto err;
if (fclose(fp)) {
fp = NULL;
goto err;
}
/* Return the number of lines read in. */
if (nlinesp != NULL)
*nlinesp = lcnt;
@ -361,7 +366,8 @@ ex_readfp(sp, name, fp, fm, nlinesp, silent)
rval = 0;
if (0) {
err: msgq_str(sp, M_SYSERR, name, "%s");
(void)fclose(fp);
if (NULL != fp)
(void)fclose(fp);
rval = 1;
}