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

const reference from instance_eval should not cause SEGV

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-07-25 08:53:49 +09:00
parent 88b638cf82
commit 08213e32e8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/variable.c
+9 -2
View File
@@ -10,6 +10,7 @@
#include "mruby/variable.h"
#include "error.h"
#include "mruby/array.h"
#include "mruby/proc.h"
#ifdef ENABLE_REGEXP
#include "re.h"
@@ -342,7 +343,10 @@ mrb_const_get(mrb_state *mrb, mrb_value mod, mrb_sym sym)
mrb_value
mrb_vm_const_get(mrb_state *mrb, mrb_sym sym)
{
return const_get(mrb, mrb->ci->target_class, sym);
struct RClass *c = mrb->ci->proc->target_class;
if (!c) c = mrb->ci->target_class;
return const_get(mrb, c, sym);
}
void
@@ -355,7 +359,10 @@ mrb_const_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v)
void
mrb_vm_const_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
{
mrb_obj_iv_set(mrb, (struct RObject*)mrb->ci->target_class, sym, v);
struct RClass *c = mrb->ci->proc->target_class;
if (!c) c = mrb->ci->target_class;
mrb_obj_iv_set(mrb, (struct RObject*)c, sym, v);
}
void