summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-compiler/core/codegen.c
diff options
context:
space:
mode:
authorFrancis Bogsanyi <[email protected]>2016-11-17 12:59:27 -0500
committerBouke van der Bijl <[email protected]>2016-11-24 10:32:34 -0500
commit964427f82c5a8556daf4448b47cc65fb6d2a94b8 (patch)
treed6f3ce9ecaf598b76a70e80e58e5af348a9f51ef /mrbgems/mruby-compiler/core/codegen.c
parenta630c4f413f6af764e68210430e8b61a435d38d7 (diff)
downloadmruby-964427f82c5a8556daf4448b47cc65fb6d2a94b8.tar.gz
mruby-964427f82c5a8556daf4448b47cc65fb6d2a94b8.zip
Fix unsafe peephole optimization
Reported by https://hackerone.com/dkasak
Diffstat (limited to 'mrbgems/mruby-compiler/core/codegen.c')
-rw-r--r--mrbgems/mruby-compiler/core/codegen.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
index 0c84dd558..39d62348a 100644
--- a/mrbgems/mruby-compiler/core/codegen.c
+++ b/mrbgems/mruby-compiler/core/codegen.c
@@ -1798,8 +1798,10 @@ codegen(codegen_scope *s, node *tree, int val)
int pos;
pop();
- if (val && vsp >= 0) {
- genop(s, MKOP_AB(OP_MOVE, vsp, cursp()));
+ if (val) {
+ if (vsp >= 0) {
+ genop(s, MKOP_AB(OP_MOVE, vsp, cursp()));
+ }
pos = genop(s, MKOP_AsBx(name[0]=='|'?OP_JMPIF:OP_JMPNOT, cursp(), 0));
}
else {