summaryrefslogtreecommitdiffhomepage
path: root/src/gc.c
diff options
context:
space:
mode:
authormimaki <[email protected]>2012-04-23 11:51:47 +0900
committermimaki <[email protected]>2012-04-23 11:51:47 +0900
commitc80487561f291e8239541687341b4d64a840c108 (patch)
treed4f7777cc91597cf880bed364df26066b9aaee8f /src/gc.c
parent835443614d21b13b27af3674d7f8cb9bf49c298b (diff)
parent3f0b98762d4a49beb7cc3f9cc8a8dfcee4aa5f6f (diff)
downloadmruby-c80487561f291e8239541687341b4d64a840c108.tar.gz
mruby-c80487561f291e8239541687341b4d64a840c108.zip
Merge branch 'master' of github.com:mruby/mruby
Conflicts: src/variable.c
Diffstat (limited to 'src/gc.c')
-rw-r--r--src/gc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gc.c b/src/gc.c
index 0921dec7a..1677dd325 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -407,8 +407,8 @@ obj_free(mrb_state *mrb, struct RBasic *obj)
struct REnv *e = (struct REnv *)obj;
if (e->cioff < 0) {
- mrb_free(mrb, mrb->stack);
- mrb->stack = 0;
+ mrb_free(mrb, e->stack);
+ e->stack = 0;
}
}
break;