From fd950878fa902a9d5ec6f3accd96bad12ca8979f Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 12 Jan 2012 15:07:16 +0000 Subject: [PATCH] scanf analysis: the 'a' length modifier is valid with a scanlist Before r148025 we (accidentally) didn't check whether a length modifier is appropriate for a scanlist, but now we do. llvm-svn: 148026 --- clang/lib/Analysis/FormatString.cpp | 1 + clang/test/Sema/format-strings-c90.c | 1 + clang/test/Sema/format-strings-scanf.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/clang/lib/Analysis/FormatString.cpp b/clang/lib/Analysis/FormatString.cpp index 8e295aa2be1c..351973529ceb 100644 --- a/clang/lib/Analysis/FormatString.cpp +++ b/clang/lib/Analysis/FormatString.cpp @@ -550,6 +550,7 @@ bool FormatSpecifier::hasValidLengthModifier() const { switch (CS.getKind()) { case ConversionSpecifier::sArg: case ConversionSpecifier::SArg: + case ConversionSpecifier::ScanListArg: return true; default: return false; diff --git a/clang/test/Sema/format-strings-c90.c b/clang/test/Sema/format-strings-c90.c index 1b00c38c0411..74e5fb17ccf7 100644 --- a/clang/test/Sema/format-strings-c90.c +++ b/clang/test/Sema/format-strings-c90.c @@ -7,6 +7,7 @@ int printf(const char *restrict, ...); void foo(char **sp, float *fp, int *ip) { /* TODO: Warn that the 'a' length modifier is an extension. */ scanf("%as", sp); + scanf("%a[abc]", sp); /* TODO: Warn that the 'a' conversion specifier is a C99 feature. */ scanf("%a", fp); diff --git a/clang/test/Sema/format-strings-scanf.c b/clang/test/Sema/format-strings-scanf.c index 2e32a26ac5cd..7a2f278aebd2 100644 --- a/clang/test/Sema/format-strings-scanf.c +++ b/clang/test/Sema/format-strings-scanf.c @@ -68,8 +68,9 @@ void test_variants(int *i, const char *s, ...) { vsscanf(buf, "%[abc", ap); // expected-warning{{no closing ']' for '%[' in scanf format string}} } -void test_scanlist(int *ip) { +void test_scanlist(int *ip, char *sp) { scanf("%[abc]", ip); // expected-warning{{conversion specifies type 'char *' but the argument has type 'int *'}} + scanf("%h[abc]", sp); // expected-warning{{length modifier 'h' results in undefined behavior or no effect with '[' conversion specifier}} } void test_alloc_extension(char **sp, wchar_t **lsp) {