diff options
| author | Hans Wennborg <hans@hanshq.net> | 2012-01-12 14:44:54 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2012-01-12 14:44:54 +0000 |
| commit | 6de0b48c5531cfe7370e1a9eeaed0566fa65dc9b (patch) | |
| tree | 6360b57d6d3879f85c0ea01ede556ce7480a3b38 | |
| parent | b4218a3fb398e63842f62156c3856b5f485eb08b (diff) | |
scanf analysis: don't bail out after successful parse of scanlist
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148025 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Analysis/ScanfFormatString.cpp | 2 | ||||
| -rw-r--r-- | test/Sema/format-strings-scanf.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/Analysis/ScanfFormatString.cpp b/lib/Analysis/ScanfFormatString.cpp index e8bd0d0e24..d248476e47 100644 --- a/lib/Analysis/ScanfFormatString.cpp +++ b/lib/Analysis/ScanfFormatString.cpp @@ -176,7 +176,7 @@ static ScanfSpecifierResult ParseScanfSpecifier(FormatStringHandler &H, } ScanfConversionSpecifier CS(conversionPosition, k); if (k == ScanfConversionSpecifier::ScanListArg) { - if (!ParseScanList(H, CS, I, E)) + if (ParseScanList(H, CS, I, E)) return true; } FS.setConversionSpecifier(CS); diff --git a/test/Sema/format-strings-scanf.c b/test/Sema/format-strings-scanf.c index d1374d4bf9..2e32a26ac5 100644 --- a/test/Sema/format-strings-scanf.c +++ b/test/Sema/format-strings-scanf.c @@ -68,6 +68,10 @@ 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) { + scanf("%[abc]", ip); // expected-warning{{conversion specifies type 'char *' but the argument has type 'int *'}} +} + void test_alloc_extension(char **sp, wchar_t **lsp) { /* Make sure "%a" gets parsed as a conversion specifier for float, * even when followed by an 's', 'S' or '[', which would cause it to be |