diff --git a/ChangeLog b/ChangeLog
index 5afb603db3..8640ac4b5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov  7 03:52:26 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_product): core dumped with non array arguments.
+	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32180]
+
 Wed Nov  7 03:32:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
diff --git a/array.c b/array.c
index 09063d7dc3..aee476a688 100644
--- a/array.c
+++ b/array.c
@@ -3170,7 +3170,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 
     /* initialize the arrays of arrays */
     arrays[0] = ary;
-    for (i = 1; i < n; i++) arrays[i] = argv[i-1];
+    for (i = 1; i < n; i++) arrays[i] = to_ary(argv[i-1]);
     
     /* initialize the counters for the arrays */
     for (i = 0; i < n; i++) counters[i] = 0;