diff options
| -rw-r--r-- | include/clang/Basic/Builtins.def | 7 | ||||
| -rw-r--r-- | test/Sema/format-strings-scanf.c | 24 |
2 files changed, 29 insertions, 2 deletions
diff --git a/include/clang/Basic/Builtins.def b/include/clang/Basic/Builtins.def index ef253e818f..e7c300d7c8 100644 --- a/include/clang/Basic/Builtins.def +++ b/include/clang/Basic/Builtins.def @@ -656,7 +656,12 @@ LIBBUILTIN(vprintf, "icC*a", "fP:0:", "stdio.h", ALL_LANGUAGES) LIBBUILTIN(vfprintf, "i.", "fP:1:", "stdio.h", ALL_LANGUAGES) LIBBUILTIN(vsnprintf, "ic*zcC*a", "fP:2:", "stdio.h", ALL_LANGUAGES) LIBBUILTIN(vsprintf, "ic*cC*a", "fP:1:", "stdio.h", ALL_LANGUAGES) -LIBBUILTIN(scanf, "icC*.", "fs:0:", "stdio.h", ALL_LANGUAGES) +LIBBUILTIN(scanf, "icC*.", "fs:0:", "stdio.h", ALL_LANGUAGES) +LIBBUILTIN(fscanf, "iP*cC*.", "fs:1:", "stdio.h", ALL_LANGUAGES) +LIBBUILTIN(sscanf, "ic*cC*.", "fs:1:", "stdio.h", ALL_LANGUAGES) +LIBBUILTIN(vscanf, "icC*a", "fS:0:", "stdio.h", ALL_LANGUAGES) +LIBBUILTIN(vfscanf, "iP*cC*a", "fS:1:", "stdio.h", ALL_LANGUAGES) +LIBBUILTIN(vsscanf, "ic*cC*a", "fS:1:", "stdio.h", ALL_LANGUAGES) // C99 LIBBUILTIN(longjmp, "vJi", "fr", "setjmp.h", ALL_LANGUAGES) diff --git a/test/Sema/format-strings-scanf.c b/test/Sema/format-strings-scanf.c index 467586215b..c0f6b0becb 100644 --- a/test/Sema/format-strings-scanf.c +++ b/test/Sema/format-strings-scanf.c @@ -1,12 +1,18 @@ // RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral %s +#include <stdarg.h> typedef __typeof(sizeof(int)) size_t; typedef struct _FILE FILE; typedef __WCHAR_TYPE__ wchar_t; int fscanf(FILE * restrict, const char * restrict, ...) ; int scanf(const char * restrict, ...) ; -int sscanf(const char * restrict, const char * restrict, ...) ; +int sscanf(char * restrict, const char * restrict, ...) ; +int my_scanf(const char * restrict, ...) __attribute__((__format__(__scanf__, 1, 2))); + +int vscanf(const char * restrict, va_list); +int vfscanf(FILE * restrict, const char * restrict, va_list); +int vsscanf(char * restrict, const char * restrict, va_list); void test(const char *s, int *i) { scanf(s, i); // expected-warning{{ormat string is not a string literal}} @@ -45,3 +51,19 @@ void pr9751() { scanf(kFormat2, str); // expected-warning{{no closing ']' for '%[' in scanf format string}} scanf("%[", str); // expected-warning{{no closing ']' for '%[' in scanf format string}} } + +void test_variants(int *i, const char *s, ...) { + FILE *f = 0; + char buf[100]; + + fscanf(f, "%ld", i); // expected-warning{{conversion specifies type 'long *' but the argument has type 'int *'}} + sscanf(buf, "%ld", i); // expected-warning{{conversion specifies type 'long *' but the argument has type 'int *'}} + my_scanf("%ld", i); // expected-warning{{conversion specifies type 'long *' but the argument has type 'int *'}} + + va_list ap; + va_start(ap, s); + + vscanf("%[abc", ap); // expected-warning{{no closing ']' for '%[' in scanf format string}} + vfscanf(f, "%[abc", ap); // expected-warning{{no closing ']' for '%[' in scanf format string}} + vsscanf(buf, "%[abc", ap); // expected-warning{{no closing ']' for '%[' in scanf format string}} +} |