summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-18 06:45:37 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-18 06:45:37 +0000
commitd4470e56de4726f6054e1412490b97408f88b805 (patch)
treee8d43102820b867573732c998d97da6534e7a17d
parent2a225d8ce35b31a1edf29e264922cca231fd5b24 (diff)
downloadruby-d4470e56de4726f6054e1412490b97408f88b805.tar.gz
ruby-d4470e56de4726f6054e1412490b97408f88b805.tar.xz
ruby-d4470e56de4726f6054e1412490b97408f88b805.zip
* insnhelper.ci (vm_yield_setup_args): rsize and psize should not be
negative. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--insnhelper.ci3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bbfddcb04..aa18e2aa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 18 15:45:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * insnhelper.ci (vm_yield_setup_args): rsize and psize should not be
+ negative.
+
Sat Aug 18 14:35:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* insnhelper.ci (vm_callee_setup_arg, vm_send_optimize,
diff --git a/insnhelper.ci b/insnhelper.ci
index ff42a7c2f..369aeef25 100644
--- a/insnhelper.ci
+++ b/insnhelper.ci
@@ -715,11 +715,10 @@ vm_yield_setup_args(rb_thread_t *th, rb_iseq_t *iseq,
if (iseq->arg_post_len) {
int len = iseq->arg_post_len;
int start = iseq->arg_post_start;
- int rsize = argc - m;
+ int rsize = argc > m ? argc - m : 0;
int psize = rsize;
VALUE ary;
- if (rsize < 0) rsize = 0;
if (psize > len) psize = len;
ary = rb_ary_new4(rsize - psize, &argv[r]);