svn commit: r266690 - head/usr.bin/printf
Pedro F. Giffuni
pfg at FreeBSD.org
Mon May 26 14:57:47 UTC 2014
Author: pfg
Date: Mon May 26 14:57:47 2014
New Revision: 266690
URL: http://svnweb.freebsd.org/changeset/base/266690
Log:
printf(1): warn about incomplete uses n$
Reviewed by: jilles
Obtained from: Illumos
MFC after: 2 weeks
Modified:
head/usr.bin/printf/printf.c
Modified: head/usr.bin/printf/printf.c
==============================================================================
--- head/usr.bin/printf/printf.c Mon May 26 13:23:36 2014 (r266689)
+++ head/usr.bin/printf/printf.c Mon May 26 14:57:47 2014 (r266690)
@@ -244,11 +244,11 @@ printf_doformat(char *fmt, int *rval)
/* save format argument */
fargv = gargv;
} else {
- fargv = NULL;
+ fargv = NULL;
}
/* skip to field width */
- while (strchr(skip1, *fmt) != NULL) {
+ while (*fmt && strchr(skip1, *fmt) != NULL) {
*dptr++ = *fmt++;
*dptr = 0;
}
@@ -259,12 +259,19 @@ printf_doformat(char *fmt, int *rval)
l = strspn(fmt, digits);
if ((l > 0) && (fmt[l] == '$')) {
int idx = atoi(fmt);
+ if (fargv == NULL) {
+ warnx("incomplete use of n$");
+ return (NULL);
+ }
if (idx <= myargc) {
gargv = &myargv[idx - 1];
} else {
gargv = &myargv[myargc];
}
fmt += l + 1;
+ } else if (fargv != NULL) {
+ warnx("incomplete use of n$");
+ return (NULL);
}
if (getint(&fieldwidth))
@@ -296,12 +303,19 @@ printf_doformat(char *fmt, int *rval)
l = strspn(fmt, digits);
if ((l > 0) && (fmt[l] == '$')) {
int idx = atoi(fmt);
+ if (fargv == NULL) {
+ warnx("incomplete use of n$");
+ return (NULL);
+ }
if (idx <= myargc) {
gargv = &myargv[idx - 1];
} else {
gargv = &myargv[myargc];
}
fmt += l + 1;
+ } else if (fargv != NULL) {
+ warnx("incomplete use of n$");
+ return (NULL);
}
if (getint(&precision))
More information about the svn-src-all
mailing list