From fb85855fa136d215533cac3714ddb99a61531fb8 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 17 Oct 2017 07:43:35 +0900 Subject: Add more checks before accessing struct pointer; ref #3831 --- mrbgems/mruby-struct/src/struct.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c index f9127c6fb..fed9e8105 100644 --- a/mrbgems/mruby-struct/src/struct.c +++ b/mrbgems/mruby-struct/src/struct.c @@ -147,11 +147,13 @@ 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 *ptr; mrb_value val; + mrb_get_args(mrb, "o", &val); mrb_struct_modify(mrb, obj); - if (i >= RSTRUCT_LEN(obj)) { + ptr = RSTRUCT_PTR(obj); + if (ptr == NULL || i >= RSTRUCT_LEN(obj)) { mrb_ary_set(mrb, obj, i, val); } else { -- cgit v1.2.3