diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ba4caf84624d..21eff5cb04c6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-28  Jason Merrill  <jason@redhat.com>
+
+	* decl.c (cp_fname_init): Correct build_string argument.
+
 2009-10-27  Jason Merrill  <jason@redhat.com>
 
 	Allow no-capture lambdas to convert to function pointer.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 33023a7649c0..349d3b3d63ef 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3512,7 +3512,7 @@ cp_fname_init (const char* name, tree *type_p)
     {
       length = strlen (name);
       domain = build_index_type (size_int (length));
-      init = build_string (length + 1, name);
+      init = build_string (length, name);
     }
 
   type = build_qualified_type (char_type_node, TYPE_QUAL_CONST);