From f5a86ca5305d70c16297b67df30ce37c102af183 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 24 Nov 2016 09:24:45 +0900 Subject: Add pointer casting from mrb_malloc(); ref #3267 --- src/variable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/variable.c') diff --git a/src/variable.c b/src/variable.c index 29f43e69d..45dc055af 100644 --- a/src/variable.c +++ b/src/variable.c @@ -44,7 +44,7 @@ iv_new(mrb_state *mrb) { iv_tbl *t; - t = mrb_malloc(mrb, sizeof(iv_tbl)); + t = (iv_tbl*)mrb_malloc(mrb, sizeof(iv_tbl)); t->size = 0; t->rootseg = NULL; t->last_len = 0; @@ -102,7 +102,7 @@ iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val) return; } - seg = mrb_malloc(mrb, sizeof(segment)); + seg = (segment*)mrb_malloc(mrb, sizeof(segment)); if (!seg) return; seg->next = NULL; seg->key[0] = sym; -- cgit v1.2.3 From 761562b65f33f47a18eae2c5db26ec48818498fc Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 12 Dec 2016 01:00:24 +0900 Subject: freeze instance variables; ref #3340 --- src/variable.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/variable.c') diff --git a/src/variable.c b/src/variable.c index 45dc055af..390da5455 100644 --- a/src/variable.c +++ b/src/variable.c @@ -489,6 +489,9 @@ mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) { iv_tbl *t = obj->iv; + if (MRB_FROZEN_P(obj)) { + mrb_raisef(mrb, E_RUNTIME_ERROR, "can't modify frozen %S", mrb_obj_value(obj)); + } if (!t) { t = obj->iv = iv_new(mrb); } -- cgit v1.2.3