admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check struct-array pointer before accessing; fix #3831

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-10-16 22:53:36 +09:00
parent 1988bec23e
commit be2c1592ed
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-struct/src/struct.c
+12 -2
View File
@@ -118,7 +118,10 @@ static mrb_value
mrb_struct_ref(mrb_state *mrb, mrb_value obj)
{
mrb_int i = mrb_fixnum(mrb_proc_cfunc_env_get(mrb, 0));
return RSTRUCT_PTR(obj)[i];
mrb_value *ptr = RSTRUCT_PTR(obj);
if (!ptr) return mrb_nil_value();
return ptr[i];
}
static mrb_sym
@@ -144,10 +147,17 @@ static mrb_value
mrb_struct_set_m(mrb_state *mrb, mrb_value obj)
{
mrb_int i = mrb_fixnum(mrb_proc_cfunc_env_get(mrb, 0));
mrb_value *ptr = RSTRUCT_PTR(obj);
mrb_value val;
mrb_get_args(mrb, "o", &val);
mrb_struct_modify(mrb, obj);
return RSTRUCT_PTR(obj)[i] = val;
if (i >= RSTRUCT_LEN(obj)) {
mrb_ary_set(mrb, obj, i, val);
}
else {
ptr[i] = val;
}
return val;
}
static mrb_bool