diff options
| author | Bouke van der Bijl <[email protected]> | 2016-11-14 17:28:18 -0500 |
|---|---|---|
| committer | Bouke van der Bijl <[email protected]> | 2016-11-24 10:20:42 -0500 |
| commit | 71641bbf732ab8cbadf8a07e20b2a939b0e3b82b (patch) | |
| tree | 1b2aa3eb2d4ab2fbab4c11da633fa0657a3afdff | |
| parent | a630c4f413f6af764e68210430e8b61a435d38d7 (diff) | |
| download | mruby-71641bbf732ab8cbadf8a07e20b2a939b0e3b82b.tar.gz mruby-71641bbf732ab8cbadf8a07e20b2a939b0e3b82b.zip | |
Fix segfault caused by empty condition in ternary
Reported by https://hackerone.com/jpenalbae
| -rw-r--r-- | mrbgems/mruby-compiler/core/codegen.c | 4 | ||||
| -rw-r--r-- | test/t/codegen.rb | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 0c84dd558..71b1dcc6f 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -1362,6 +1362,10 @@ codegen(codegen_scope *s, node *tree, int val) int pos1, pos2; node *e = tree->cdr->cdr->car; + if (!tree->car) { + codegen(s, e, val); + return; + } switch ((intptr_t)tree->car->car) { case NODE_TRUE: case NODE_INT: diff --git a/test/t/codegen.rb b/test/t/codegen.rb new file mode 100644 index 000000000..99d6dbe66 --- /dev/null +++ b/test/t/codegen.rb @@ -0,0 +1,6 @@ +## +# Codegen tests + +assert('empty condition in ternary expression parses correctly') do + assert_equal () ? 1 : 2, 2 +end |