merges r28869 from trunk into ruby_1_9_2.

--
* complex.c (nucomp_marshal_load): should check the argument.
  [ruby-core:31622]

* rational.c (nurat_marshal_load): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/complex.c b/complex.c
index 64ea345862..cbbc3b17ce 100644
--- a/complex.c
+++ b/complex.c
@@ -1239,6 +1239,7 @@ static VALUE
 nucomp_marshal_load(VALUE self, VALUE a)
 {
     get_dat1(self);
+    Check_Type(a, T_ARRAY);
     dat->real = RARRAY_PTR(a)[0];
     dat->imag = RARRAY_PTR(a)[1];
     rb_copy_generic_ivar(self, a);