d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use LINE_MAX from limits.h as the maximum line length instead of

Browse Source 
BUFSIZ. Use LINE_MAX * 2 as the buffer size (BSIZE).
- Error out if we encounter a line longer than LINE_MAX. The previous
  behavior was to silently split long lines and produce corrupted
  output.

PR:		bin/151384
This commit is contained in:
Jaakko Heinonen 2011-02-07 18:10:18 +00:00
parent a373cd6a6f
commit 96a7586b7d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=218411
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/rs/rs.c
View File

@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -328,8 +329,8 @@ prepfile(void)
warnx("%d is colwidths, nelem %d", colwidths[i], nelem);*/
}
#define BSIZE 2048
char ibuf[BSIZE]; /* two screenfuls should do */
#define BSIZE (LINE_MAX * 2)
char ibuf[BSIZE];
int
getline(void) /* get line; maintain curline, curlen; manage storage */
@ -350,7 +351,7 @@ getline(void) /* get line; maintain curline, curlen; manage storage */
curline = ibuf;
}
}
if (!putlength && endblock - curline < BUFSIZ) { /* need storage */
if (!putlength && endblock - curline < LINE_MAX + 1) { /* need storage */
/*ww = endblock-curline; tt += ww;*/
/*printf("#wasted %d total %d\n",ww,tt);*/
if (!(curline = (char *) malloc(BSIZE)))
@ -358,11 +359,16 @@ getline(void) /* get line; maintain curline, curlen; manage storage */
endblock = curline + BSIZE;
/*printf("#endb %d curline %d\n",endblock,curline);*/
}
for (p = curline, i = 1; i < BUFSIZ; *p++ = c, i++)
if ((c = getchar()) == EOF || c == '\n')
for (p = curline, i = 0;; *p++ = c, i++) {
if ((c = getchar()) == EOF)
break;
if (i >= LINE_MAX)
errx(1, "maximum line length (%d) exceeded", LINE_MAX);
if (c == '\n')
break;
}
*p = '\0';
curlen = i - 1;
curlen = i;
return(c);
}