diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-14 09:05:09 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-14 09:05:09 +0000 |
commit | 886214bc0136207264428f42a5d5ca31a7e1ac9b (patch) | |
tree | ed5ed69543558ab5fb57ab25d28a12b581ffb279 | |
parent | eb89ad23cb322c5c2c435efd42f271daa80d6327 (diff) |
* proc.c (rb_proc_call): checks overflow.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | proc.c | 9 |
2 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,6 @@ -Sat Mar 14 17:59:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Mar 14 18:05:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * proc.c (rb_proc_call): checks overflow. * proc.c (rb_proc_parameters): unnamed_parameters() expects in not VALUE. @@ -529,10 +529,17 @@ proc_call(int argc, VALUE *argv, VALUE procval) VALUE rb_proc_call(VALUE self, VALUE args) { + long argc = RARRAY_LEN(args); rb_proc_t *proc; GetProcPtr(self, proc); +#if SIZEOF_LONG > SIZEOF_INT + if (argc > INT_MAX || argc < 0) { + rb_raise(rb_eArgError, "too many arguments (%lu)", + (unsigned long)argc); + } +#endif return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, - RARRAY_LEN(args), RARRAY_PTR(args), 0); + (int)argc, RARRAY_PTR(args), 0); } VALUE |