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  <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.
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