From 886214bc0136207264428f42a5d5ca31a7e1ac9b Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 14 Mar 2009 09:05:09 +0000 Subject: * proc.c (rb_proc_call): checks overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- proc.c | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ae5cf7a05..a53493f4e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Sat Mar 14 17:59:10 2009 Nobuyoshi Nakada +Sat Mar 14 18:05:08 2009 Nobuyoshi Nakada + + * proc.c (rb_proc_call): checks overflow. * proc.c (rb_proc_parameters): unnamed_parameters() expects in not VALUE. diff --git a/proc.c b/proc.c index a70b29294e..e20e1d902f 100644 --- a/proc.c +++ b/proc.c @@ -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 -- cgit v1.2.3