diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c6d0675231d..29db4eb2669 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-22  Kai Tietz  <ktietz@redhat.com>
+
+	* lang.c (put_decl_node): Don't iterate over end_params_node.
+
 2013-01-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* jcf-dump.c (version): Update copyright notice dates.
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index fd9364df1d4..d40af8722b5 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -419,7 +419,8 @@ put_decl_node (tree node, int verbosity)
 	      if (TREE_CODE (TREE_TYPE (node)) == METHOD_TYPE)
 		args = TREE_CHAIN (args);
 	      put_decl_string ("(", 1);
-	      for ( ; args != end_params_node;  args = TREE_CHAIN (args), i++)
+	      for ( ; args != NULL_TREE && args != end_params_node;
+		   args = TREE_CHAIN (args), i++)
 		{
 		  if (i > 0)
 		    put_decl_string (",", 1);