summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-bin-mruby
diff options
context:
space:
mode:
authordearblue <[email protected]>2020-01-29 22:02:43 +0900
committerdearblue <[email protected]>2020-01-29 23:30:13 +0900
commit9840e5352b2abf96235068f0e9d08f14b1d333cf (patch)
treeadabd97033d166ba39b18697f5279f856f6ee428 /mrbgems/mruby-bin-mruby
parent0aa5aa1de29d61e40a0c1e9be40ee9e14fe284bd (diff)
downloadmruby-9840e5352b2abf96235068f0e9d08f14b1d333cf.tar.gz
mruby-9840e5352b2abf96235068f0e9d08f14b1d333cf.zip
Isolate top-level local variables by file scope; fix #4931
Diffstat (limited to 'mrbgems/mruby-bin-mruby')
-rw-r--r--mrbgems/mruby-bin-mruby/tools/mruby/mruby.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index 7614ce6cd..b44345fe4 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -6,6 +6,7 @@
#include <mruby/compile.h>
#include <mruby/dump.h>
#include <mruby/variable.h>
+#include <mruby/proc.h>
struct _args {
FILE *rfp;
@@ -303,6 +304,7 @@ main(int argc, char **argv)
/* Load libraries */
for (i = 0; i < args.libc; i++) {
+ struct REnv *e;
FILE *lfp = fopen(args.libv[i], args.mrbfile ? "rb" : "r");
if (lfp == NULL) {
fprintf(stderr, "%s: Cannot open library file: %s\n", *argv, args.libv[i]);
@@ -317,6 +319,9 @@ main(int argc, char **argv)
v = mrb_load_file_cxt(mrb, lfp, c);
}
fclose(lfp);
+ e = mrb->c->cibase->env;
+ mrb->c->cibase->env = NULL;
+ mrb_env_unshare(mrb, e);
mrbc_cleanup_local_variables(mrb, c);
}