2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f29f7e4a3c..e57443eea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 19 09:49:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (list_concat): should not modify nodes other than
+	  NODE_ARRAY.  [ruby-dev:28583]
+
 Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
diff --git a/parse.y b/parse.y
index 18f1668e57..d50f06d104 100644
--- a/parse.y
+++ b/parse.y
@@ -4665,6 +4665,8 @@ list_concat(head, tail)
 {
     NODE *last;
 
+    if (nd_type(tail) != NODE_ARRAY)
+        return list_append(head, tail);
     if (head->nd_next) {
 	last = head->nd_next->nd_end;
     }