Author: jh
Date: Fri Oct 7 14:29:15 2011
New Revision: 226107
URL: http://svn.freebsd.org/changeset/base/226107
Log:
MFC r218411:
- Use LINE_MAX from limits.h as the maximum line length instead of
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
Modified:
stable/7/usr.bin/rs/rs.c
Directory Properties:
stable/7/usr.bin/rs/ (props changed)
Modified: stable/7/usr.bin/rs/rs.c
==============================================================================
--- stable/7/usr.bin/rs/rs.c Fri Oct 7 14:27:20 2011 (r226106)
+++ stable/7/usr.bin/rs/rs.c Fri Oct 7 14:29:15 2011 (r226107)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <ctype.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -333,8 +334,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 */
@@ -355,7 +356,7 @@ getline(void) /* get line; maintain curl
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)))
@@ -363,11 +364,16 @@ getline(void) /* get line; maintain curl
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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
