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

variable.c: check index overflow

Browse Source 
* variable.c (rb_ivar_set), vm_insnhelper.c (vm_setivar): check
  instance variable index overflow.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-09-10 08:05:12 +00:00
parent 6a6362d633
commit ddf6eb40c7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
variable.c
View File

@ -1153,6 +1153,7 @@ rb_ivar_set(VALUE obj, ID id, VALUE val)
ivar_extended = 0; ivar_extended = 0;
if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) { if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) {
index = iv_index_tbl->num_entries; index = iv_index_tbl->num_entries;
if (index >= INT_MAX) rb_raise(rb_eArgError, "too many instance variables");
st_add_direct(iv_index_tbl, (st_data_t)id, index); st_add_direct(iv_index_tbl, (st_data_t)id, index);
ivar_extended = 1; ivar_extended = 1;
} }

5
vm_insnhelper.c
View File

@ -570,8 +570,11 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic, rb_call_info_t *ci, int is_attr)
ic->ic_value.index = index; ic->ic_value.index = index;
ic->ic_serial = RCLASS_SERIAL(klass); ic->ic_serial = RCLASS_SERIAL(klass);
} }
else if (index >= INT_MAX) {
rb_raise(rb_eArgError, "too many instance variables");
}
else { else {
ci->aux.index = index + 1; ci->aux.index = (int)(index + 1);
} }
} }
/* fall through */ /* fall through */