1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_eval.c, vm_insnhelper.c: argument number is restricted to

Browse Source 
int, and fixed overflow.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-05-20 09:58:29 +00:00
parent 6494314d2a
commit 53812198da
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed May 20 18:58:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c, vm_insnhelper.c: argument number is restricted to
int, and fixed overflow.
Wed May 20 18:34:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed May 20 18:34:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enum.c (zip_ary): should use long. * enum.c (zip_ary): should use long.

6
vm_eval.c
View File

@ -69,7 +69,7 @@ vm_call0(rb_thread_t * th, VALUE klass, VALUE recv, VALUE id, ID oid,
cfp->method_id = oid; cfp->method_id = oid;
cfp->method_class = klass; cfp->method_class = klass;
val = call_cfunc(body->nd_cfnc, recv, body->nd_argc, argc, argv); val = call_cfunc(body->nd_cfnc, recv, (int)body->nd_argc, argc, argv);
if (reg_cfp != th->cfp + 1) { if (reg_cfp != th->cfp + 1) {
SDR2(reg_cfp); SDR2(reg_cfp);
@ -199,12 +199,12 @@ rb_call0(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv,
return method_missing(recv, mid, argc, argv, return method_missing(recv, mid, argc, argv,
scope == 2 ? NOEX_VCALL : 0); scope == 2 ? NOEX_VCALL : 0);
id = ent->mid0; id = ent->mid0;
noex = ent->method->nd_noex; noex = (int)ent->method->nd_noex;
klass = ent->method->nd_clss; klass = ent->method->nd_clss;
body = ent->method->nd_body; body = ent->method->nd_body;
} }
else if ((method = rb_get_method_body(klass, id, &id)) != 0) { else if ((method = rb_get_method_body(klass, id, &id)) != 0) {
noex = method->nd_noex; noex = (int)method->nd_noex;
klass = method->nd_clss; klass = method->nd_clss;
body = method->nd_body; body = method->nd_body;
} }

32
vm_insnhelper.c
View File

@ -118,7 +118,7 @@ vm_callee_setup_arg_complex(rb_thread_t *th, const rb_iseq_t * iseq,
const int m = iseq->argc; const int m = iseq->argc;
int argc = orig_argc; int argc = orig_argc;
VALUE *argv = orig_argv; VALUE *argv = orig_argv;
int opt_pc = 0; rb_num_t opt_pc = 0;
th->mark_stack_len = argc + iseq->arg_size; th->mark_stack_len = argc + iseq->arg_size;
@ -200,7 +200,7 @@ vm_callee_setup_arg_complex(rb_thread_t *th, const rb_iseq_t * iseq,
} }
th->mark_stack_len = 0; th->mark_stack_len = 0;
return opt_pc; return (int)opt_pc;
} }
static inline int static inline int
@ -251,7 +251,7 @@ caller_setup_args(const rb_thread_t *th, rb_control_frame_t *cfp, VALUE flag,
/* do nothing */ /* do nothing */
} }
else { else {
int len = RARRAY_LEN(tmp); long len = RARRAY_LEN(tmp);
ptr = RARRAY_PTR(tmp); ptr = RARRAY_PTR(tmp);
cfp->sp -= 1; cfp->sp -= 1;
@ -373,7 +373,7 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
reg_cfp->sp -= num + 1; reg_cfp->sp -= num + 1;
val = call_cfunc(mn->nd_cfnc, recv, mn->nd_argc, num, reg_cfp->sp + 1); val = call_cfunc(mn->nd_cfnc, recv, (int)mn->nd_argc, num, reg_cfp->sp + 1);
if (reg_cfp != th->cfp + 1) { if (reg_cfp != th->cfp + 1) {
rb_bug("cfp consistency error - send"); rb_bug("cfp consistency error - send");
@ -443,7 +443,7 @@ vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp,
sp = rsp + iseq->arg_size; sp = rsp + iseq->arg_size;
if (LIKELY(!(flag & VM_CALL_TAILCALL_BIT))) { if (LIKELY(!(flag & VM_CALL_TAILCALL_BIT))) {
if (0) printf("local_size: %d, arg_size: %d\n", if (0) printf("local_size: %"PRIdSIZE", arg_size: %d\n",
iseq->local_size, iseq->arg_size); iseq->local_size, iseq->arg_size);
/* clear local variables */ /* clear local variables */
@ -617,7 +617,7 @@ vm_send_optimize(rb_control_frame_t * const reg_cfp, NODE ** const mn,
extern VALUE rb_f_send(int argc, VALUE *argv, VALUE recv); extern VALUE rb_f_send(int argc, VALUE *argv, VALUE recv);
if (node->nd_cfnc == rb_f_send) { if (node->nd_cfnc == rb_f_send) {
int i = *num - 1; rb_num_t i = *num - 1;
VALUE sym = TOPN(i); VALUE sym = TOPN(i);
*id = SYMBOL_P(sym) ? SYM2ID(sym) : rb_to_id(sym); *id = SYMBOL_P(sym) ? SYM2ID(sym) : rb_to_id(sym);
@ -700,7 +700,7 @@ static inline int
vm_yield_setup_block_args_complex(rb_thread_t *th, const rb_iseq_t * iseq, vm_yield_setup_block_args_complex(rb_thread_t *th, const rb_iseq_t * iseq,
int argc, VALUE * argv) int argc, VALUE * argv)
{ {
int opt_pc = 0; rb_num_t opt_pc = 0;
int i; int i;
const int m = iseq->argc; const int m = iseq->argc;
const int r = iseq->arg_rest; const int r = iseq->arg_rest;
@ -750,7 +750,7 @@ vm_yield_setup_block_args_complex(rb_thread_t *th, const rb_iseq_t * iseq,
argv[start + i] = Qnil; argv[start + i] = Qnil;
} }
return opt_pc; return (int)opt_pc;
} }
static inline int static inline int
@ -762,7 +762,7 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq,
int argc = orig_argc; int argc = orig_argc;
const int m = iseq->argc; const int m = iseq->argc;
VALUE ary; VALUE ary;
int opt_pc = 0; rb_num_t opt_pc = 0;
th->mark_stack_len = argc; th->mark_stack_len = argc;
@ -867,7 +867,7 @@ vm_invoke_block(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_num_t num, rb_n
{ {
rb_block_t * const block = GET_BLOCK_PTR(); rb_block_t * const block = GET_BLOCK_PTR();
rb_iseq_t *iseq; rb_iseq_t *iseq;
int argc = num; int argc = (int)num;
if (GET_ISEQ()->local_iseq->type != ISEQ_TYPE_METHOD || block == 0) { if (GET_ISEQ()->local_iseq->type != ISEQ_TYPE_METHOD || block == 0) {
rb_vm_localjump_error("no block given (yield)", Qnil, 0); rb_vm_localjump_error("no block given (yield)", Qnil, 0);
@ -1254,8 +1254,8 @@ static VALUE
vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp, vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
rb_num_t throw_state, VALUE throwobj) rb_num_t throw_state, VALUE throwobj)
{ {
rb_num_t state = throw_state & 0xff; int state = (int)(throw_state & 0xff);
rb_num_t flag = throw_state & 0x8000; int flag = (int)(throw_state & 0x8000);
rb_num_t level = throw_state >> 16; rb_num_t level = throw_state >> 16;
if (state != 0) { if (state != 0) {
@ -1398,13 +1398,13 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
} }
static inline void static inline void
vm_expandarray(rb_control_frame_t *cfp, VALUE ary, int num, int flag) vm_expandarray(rb_control_frame_t *cfp, VALUE ary, rb_num_t num, int flag)
{ {
int is_splat = flag & 0x01; int is_splat = flag & 0x01;
int space_size = num + is_splat; rb_num_t space_size = num + is_splat;
VALUE *base = cfp->sp, *ptr; VALUE *base = cfp->sp, *ptr;
volatile VALUE tmp_ary; volatile VALUE tmp_ary;
int len; long len;
if (TYPE(ary) != T_ARRAY) { if (TYPE(ary) != T_ARRAY) {
ary = rb_ary_to_ary(ary); ary = rb_ary_to_ary(ary);
@ -1418,7 +1418,7 @@ vm_expandarray(rb_control_frame_t *cfp, VALUE ary, int num, int flag)
if (flag & 0x02) { if (flag & 0x02) {
/* post: ..., nil ,ary[-1], ..., ary[0..-num] # top */ /* post: ..., nil ,ary[-1], ..., ary[0..-num] # top */
int i = 0, j; long i = 0, j;
if (len < num) { if (len < num) {
for (i=0; i<num-len; i++) { for (i=0; i<num-len; i++) {