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

mruby-struct/struct.c (mrb_struct_ref): update the function

Browse Source 
- use `num_members`
- ensure the function takes no argument
- avoid out-of-bound access when struct is failed to initialize
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-05-24 17:53:41 +09:00
parent 69d33de527
commit c2f3f103bb
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-struct/src/struct.c
+13 -8
View File
@@ -104,13 +104,25 @@ mrb_struct_members(mrb_state *mrb, mrb_value obj)
return mrb_struct_s_members_m(mrb, mrb_obj_value(mrb_obj_class(mrb, obj)));
}
static mrb_int
num_members(mrb_state *mrb, mrb_value self)
{
mrb_value members = struct_members(mrb, self);
return RARRAY_LEN(members);
}
static mrb_value
mrb_struct_ref(mrb_state *mrb, mrb_value obj)
{
mrb_int argc = mrb_get_argc(mrb);
if (argc != 0) {
mrb_argnum_error(mrb, argc, 0, 0);
}
mrb_int i = mrb_integer(mrb_proc_cfunc_env_get(mrb, 0));
mrb_int len = num_members(mrb, obj);
mrb_value *ptr = RSTRUCT_PTR(obj);
if (!ptr) return mrb_nil_value();
if (!ptr || len <= i) return mrb_nil_value();
return ptr[i];
}
@@ -289,13 +301,6 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
return st;
}
static mrb_int
num_members(mrb_state *mrb, mrb_value self)
{
mrb_value members = struct_members(mrb, self);
return RARRAY_LEN(members);
}
/* 15.2.18.4.8 */
/*
*/