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

plug leaks, coverity cids 1618, 1619.

This commit is contained in:
elad 2006-03-20 17:32:17 +00:00
parent cd7d931d2e
commit d7e635e034
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libutil/passwd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: passwd.c,v 1.42 2005/09/14 02:12:34 christos Exp $ */
/* $NetBSD: passwd.c,v 1.43 2006/03/20 17:32:17 elad Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: passwd.c,v 1.42 2005/09/14 02:12:34 christos Exp $");
__RCSID("$NetBSD: passwd.c,v 1.43 2006/03/20 17:32:17 elad Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@ -364,12 +364,15 @@ pw_copyx(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw,
}
if (!(to = fdopen(tfd, "w"))) {
snprintf(errbuf, errbufsz, "%s: %s", mpwdl, strerror(errno));
(void)fclose(from);
return (0);
}
for (done = 0; fgets(buf, (int)sizeof(buf), from);) {
if (!strchr(buf, '\n')) {
snprintf(errbuf, errbufsz, "%s: line too long", mpwd);
(void)fclose(from);
(void)fclose(to);
return (0);
}
if (done) {
@ -377,12 +380,16 @@ pw_copyx(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw,
if (ferror(to)) {
snprintf(errbuf, errbufsz, "%s",
strerror(errno));
(void)fclose(from);
(void)fclose(to);
return (0);
}
continue;
}
if (!(p = strchr(buf, ':'))) {
snprintf(errbuf, errbufsz, "%s: corrupted entry", mpwd);
(void)fclose(from);
(void)fclose(to);
return (0);
}
*p = '\0';
@ -392,6 +399,8 @@ pw_copyx(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw,
if (ferror(to)) {
snprintf(errbuf, errbufsz, "%s",
strerror(errno));
(void)fclose(from);
(void)fclose(to);
return (0);
}
continue;
@ -400,6 +409,8 @@ pw_copyx(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw,
if (old_pw && !pw_equal(buf, old_pw)) {
snprintf(errbuf, errbufsz, "%s: entry inconsistent",
mpwd);
(void)fclose(from);
(void)fclose(to);
return (0);
}
(void)fprintf(to, "%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n",
@ -409,6 +420,8 @@ pw_copyx(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw,
done = 1;
if (ferror(to)) {
snprintf(errbuf, errbufsz, "%s", strerror(errno));
(void)fclose(from);
(void)fclose(to);
return (0);
}
}
@ -429,8 +442,11 @@ pw_copyx(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw,
if (ferror(to)) {
snprintf(errbuf, errbufsz, "%s", strerror(errno));
(void)fclose(from);
(void)fclose(to);
return (0);
}
(void)fclose(from);
(void)fclose(to);
return (done);