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

If fgetln() returns a buffer that isn't terminated by \n, free the temporary 

buffer inside the loop.  Fixes coverty CID:1674.
(This should only happen at EOF, so the loop SHOULD terminate.)
While here always output a newline at the end of the input data even when
the last (unterminated) line doesn't contain a separator.
This commit is contained in:
dsl 2006-03-30 19:17:44 +00:00
parent 9c75397609
commit 4c18b91e3e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/cut/cut.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cut.c,v 1.18 2005/03/22 21:56:28 yamt Exp $ */
/* $NetBSD: cut.c,v 1.19 2006/03/30 19:17:44 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
#endif
__RCSID("$NetBSD: cut.c,v 1.18 2005/03/22 21:56:28 yamt Exp $");
__RCSID("$NetBSD: cut.c,v 1.19 2006/03/30 19:17:44 dsl Exp $");
#endif /* not lint */
#include <ctype.h>
@ -232,7 +232,7 @@ f_cut(FILE *fp, const char *fname)
if ((tbuf = (char *)malloc(len + 1)) == NULL)
err(1, NULL);
memcpy(tbuf, lbuf, len);
tbuf[len] = '\n';
tbuf[len++] = '\n';
lbuf = tbuf;
}
for (isdelim = 0, p = lbuf;; ++p) {
@ -273,9 +273,11 @@ f_cut(FILE *fp, const char *fname)
for (; (ch = *p) != '\n'; ++p);
}
(void)putchar('\n');
if (tbuf) {
free(tbuf);
tbuf = NULL;
}
}
if (tbuf)
free(tbuf);
}
void