[Sema] Fix PR30481: crash on checking printf args.

We were falling through from one case to another in a switch statement.
Oops.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@282124 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 1e17afc06bfa73e89c81688e681558fc0435e69b..0604c5aeac4453d78a5af26d183f5da612a8d07f 100644 (file)
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -4194,9 +4194,9 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
           goto tryAgain;
         }
       }
-
-      return SLCT_NotALiteral;
     }
+
+    return SLCT_NotALiteral;
   }
   case Stmt::UnaryOperatorClass: {
     const UnaryOperator *UnaOp = cast<UnaryOperator>(E);

diff --git a/test/Sema/format-strings.c b/test/Sema/format-strings.c
index a6b3a699364434d99dc6b0d560716f8c06d785e9..5c332bd37a0c81d52ca4965702e7e59ec13d5c5b 100644 (file)
--- a/test/Sema/format-strings.c
+++ b/test/Sema/format-strings.c
@@ -687,3 +687,8 @@ void test_char_pointer_arithmetic(int b) {
   printf(s7 + 3, "");  // expected-warning{{more '%' conversions than data arguments}}
   // expected-note@-2{{format string is defined here}}
 }
+
+void PR30481() {
+  // This caused crashes due to invalid casts.
+  printf(1 > 0); // expected-warning{{format string is not a string literal}} expected-warning{{incompatible integer to pointer conversion}} expected-note@format-strings.c:*{{passing argument to parameter here}} expected-note{{to avoid this}}
+}