Fix crasher caused by setting a bit in a possibly empty bitvector while
doing printf format string checking. This is a recent regression.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97318 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 7198dad..c7b9cb7 100644
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -1283,7 +1283,12 @@
// Consume the argument.
unsigned argIndex = FS.getArgIndex();
- CoveredArgs.set(argIndex);
+ if (argIndex < NumDataArgs) {
+ // The check to see if the argIndex is valid will come later.
+ // We set the bit here because we may exit early from this
+ // function if we encounter some other error.
+ CoveredArgs.set(argIndex);
+ }
// Check for using an Objective-C specific conversion specifier
// in a non-ObjC literal.
diff --git a/test/Sema/format-strings.c b/test/Sema/format-strings.c
index e92e17d..21d3aec 100644
--- a/test/Sema/format-strings.c
+++ b/test/Sema/format-strings.c
@@ -145,6 +145,7 @@
}
void test10(int x, float f, int i, long long lli) {
+ printf("%s"); // expected-warning{{more '%' conversions than data arguments}}
printf("%@", 12); // expected-warning{{invalid conversion specifier '@'}}
printf("\0"); // expected-warning{{format string contains '\0' within the string body}}
printf("xs\0"); // expected-warning{{format string contains '\0' within the string body}}
diff --git a/test/SemaObjC/format-strings-objc.m b/test/SemaObjC/format-strings-objc.m
index 7abfe96..1fcc34f 100644
--- a/test/SemaObjC/format-strings-objc.m
+++ b/test/SemaObjC/format-strings-objc.m
@@ -50,3 +50,8 @@
printf("%i ",test); // expected-warning{{conversion specifies type 'int' but the argument has type 'long long'}}
NSLog(@"%i ",test); // expected-warning{{conversion specifies type 'int' but the argument has type 'long long'}}
}
+
+// <rdar://problem/7697748>
+void rdar_7697748() {
+ NSLog(@"%@!"); // expected-warning{{more '%' conversions than data arguments}}
+}