summaryrefslogtreecommitdiff
path: root/complex.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-25 07:39:32 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-25 07:39:32 +0000
commit7e2e3dc85d8c02672bc7486630424e7df95ef28b (patch)
tree52af64559189d0454b8b82f86bc6a5475816b6e7 /complex.c
parent76dc4b9a24863717e7b4f722105eec044f85801b (diff)
merge revision(s) 34803:
* complex.c (nucomp_marshal_load): raise error on invalid data. reported by John Firebaugh [ruby-core:42860] [Bug #6076] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'complex.c')
-rw-r--r--complex.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/complex.c b/complex.c
index 1617054816..5b1a5102a1 100644
--- a/complex.c
+++ b/complex.c
@@ -1260,6 +1260,8 @@ nucomp_marshal_load(VALUE self, VALUE a)
{
get_dat1(self);
Check_Type(a, T_ARRAY);
+ if (RARRAY_LEN(a) != 2)
+ rb_raise(rb_eArgError, "marshaled complex must have an array whose length is 2 but %ld", RARRAY_LEN(a));
dat->real = RARRAY_PTR(a)[0];
dat->imag = RARRAY_PTR(a)[1];
rb_copy_generic_ivar(self, a);