diff options
| -rw-r--r-- | lib/Sema/SemaChecking.cpp | 52 | ||||
| -rw-r--r-- | test/Sema/format-strings.c | 5 |
2 files changed, 32 insertions, 25 deletions
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index 67d9a1acbf..22dcc49b55 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -917,36 +917,38 @@ void Sema::CheckPrintfString(const StringLiteral *FExpr, case '*': { ++numConversions; - if (!HasVAListArg && numConversions > numDataArgs) { + if (!HasVAListArg) { + if (numConversions > numDataArgs) { + SourceLocation Loc = getLocationOfStringLiteralByte(FExpr, StrIdx); + + if (Str[StrIdx-1] == '.') + Diag(Loc, diag::warn_printf_asterisk_precision_missing_arg) + << OrigFormatExpr->getSourceRange(); + else + Diag(Loc, diag::warn_printf_asterisk_width_missing_arg) + << OrigFormatExpr->getSourceRange(); + + // Don't do any more checking. We'll just emit spurious errors. + return; + } + + // Perform type checking on width/precision specifier. + const Expr *E = TheCall->getArg(format_idx+numConversions); + if (const BuiltinType *BT = E->getType()->getAsBuiltinType()) + if (BT->getKind() == BuiltinType::Int) + break; + SourceLocation Loc = getLocationOfStringLiteralByte(FExpr, StrIdx); - + if (Str[StrIdx-1] == '.') - Diag(Loc, diag::warn_printf_asterisk_precision_missing_arg) - << OrigFormatExpr->getSourceRange(); + Diag(Loc, diag::warn_printf_asterisk_precision_wrong_type) + << E->getType() << E->getSourceRange(); else - Diag(Loc, diag::warn_printf_asterisk_width_missing_arg) - << OrigFormatExpr->getSourceRange(); + Diag(Loc, diag::warn_printf_asterisk_width_wrong_type) + << E->getType() << E->getSourceRange(); - // Don't do any more checking. We'll just emit spurious errors. - return; + break; } - - // Perform type checking on width/precision specifier. - const Expr *E = TheCall->getArg(format_idx+numConversions); - if (const BuiltinType *BT = E->getType()->getAsBuiltinType()) - if (BT->getKind() == BuiltinType::Int) - break; - - SourceLocation Loc = getLocationOfStringLiteralByte(FExpr, StrIdx); - - if (Str[StrIdx-1] == '.') - Diag(Loc, diag::warn_printf_asterisk_precision_wrong_type) - << E->getType() << E->getSourceRange(); - else - Diag(Loc, diag::warn_printf_asterisk_width_wrong_type) - << E->getType() << E->getSourceRange(); - - break; } // Characters which can terminate a format conversion diff --git a/test/Sema/format-strings.c b/test/Sema/format-strings.c index 50903b0cf8..1826c7457e 100644 --- a/test/Sema/format-strings.c +++ b/test/Sema/format-strings.c @@ -125,3 +125,8 @@ void test9(char *P) { printf(P, 42); printf("%n", &x); // expected-warning {{use of '%n' in format string discouraged }} } + +void torture(va_list v8) { + vprintf ("%*.*d", v8); // no-warning +} + |