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

Make the syntax checks for the format string more strict. The string

Browse Source 
"%8*s" is no longer considered to be a valid format description.

This closes PR bin/386.
This commit is contained in:
Joerg Wunsch 1995-05-07 07:00:18 +00:00
parent 6d3fd1b72c
commit d867cefdcb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=8323
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
usr.bin/printf/printf.c
View File

@ -132,7 +132,7 @@ main(argc, argv)
* up the format string.
*/
skip1 = "#-+ 0";
skip2 = "*0123456789";
skip2 = "0123456789";
escape(fmt = format = *argv); /* backslash interpretation */
gargv = ++argv;
@ -170,21 +170,28 @@ next: for (start = fmt;; ++fmt) {
if (*fmt == '*') {
if (getint(&fieldwidth))
return (1);
} else
++fmt;
} else {
fieldwidth = 0;
/* skip to possible '.', get following precision */
for (; strchr(skip2, *fmt); ++fmt);
if (*fmt == '.')
/* skip to possible '.', get following precision */
for (; strchr(skip2, *fmt); ++fmt);
}
if (*fmt == '.') {
/* precision present? */
++fmt;
if (*fmt == '*') {
if (getint(&precision))
return (1);
if (*fmt == '*') {
if (getint(&precision))
return (1);
++fmt;
} else {
precision = 0;
/* skip to conversion char */
for (; strchr(skip2, *fmt); ++fmt);
}
} else
precision = 0;
/* skip to conversion char */
for (; strchr(skip2, *fmt); ++fmt);
if (!*fmt) {
warnx("missing format character", NULL, NULL);
return (1);
@ -227,7 +234,7 @@ next: for (start = fmt;; ++fmt) {
break;
}
default:
warnx("illegal format character", NULL, NULL);
warnx("illegal format character %c", convch, NULL);
return (1);
}
*fmt = nextch;