commit b171d6f55d564243031b17fc1db1a66509574534
Author: Jason Merrill <jason@redhat.com>
Date: Fri Jan 16 09:20:17 2015 -0500
PR c++/64629
* c-format.c (check_format_arg): Call decl_constant_value.
@@ -1443,6 +1443,13 @@ check_format_arg (void *ctx, tree format_tree,
tree array_init;
alloc_pool fwt_pool;
+ if (TREE_CODE (format_tree) == VAR_DECL)
+ {
+ /* Pull out a constant value if the front end didn't. */
+ format_tree = decl_constant_value (format_tree);
+ STRIP_NOPS (format_tree);
+ }
+
if (integer_zerop (format_tree))
{
/* Skip to first argument to check, so we can see if this format
new file mode 100644
@@ -0,0 +1,10 @@
+// PR c++/64629
+// { dg-options "-Wformat -Wformat-security" }
+
+extern void bar (int, const char *, ...) __attribute__((format (printf, 2, 3)));
+void
+foo (void)
+{
+ const char *const msg = "abc";
+ bar (1, msg);
+}