diff options
| author | Bouke van der Bijl <[email protected]> | 2016-11-14 17:57:43 -0500 |
|---|---|---|
| committer | Bouke van der Bijl <[email protected]> | 2016-11-24 10:13:47 -0500 |
| commit | 22f550405449faf5bb424f04a52835376add2ae2 (patch) | |
| tree | fa0c6a011dc405e0c85e8222a3cc7f79d6ef9d26 | |
| parent | a630c4f413f6af764e68210430e8b61a435d38d7 (diff) | |
| download | mruby-22f550405449faf5bb424f04a52835376add2ae2.tar.gz mruby-22f550405449faf5bb424f04a52835376add2ae2.zip | |
Fix segfault on remove_method with invalid argument
Reported by https://hackerone.com/jpenalbae
| -rw-r--r-- | src/class.c | 2 | ||||
| -rw-r--r-- | test/t/class.rb | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/class.c b/src/class.c index d02253c57..d120f1fec 100644 --- a/src/class.c +++ b/src/class.c @@ -2068,7 +2068,7 @@ mrb_mod_remove_method(mrb_state *mrb, mrb_value mod) mrb_get_args(mrb, "*", &argv, &argc); while (argc--) { - remove_method(mrb, mod, mrb_symbol(*argv)); + remove_method(mrb, mod, to_sym(mrb, *argv)); argv++; } return mod; diff --git a/test/t/class.rb b/test/t/class.rb index 7bcaaf90d..597999d3e 100644 --- a/test/t/class.rb +++ b/test/t/class.rb @@ -401,3 +401,12 @@ assert('class with non-class/module outer raises TypeError') do assert_raise(TypeError) { class 0::C1; end } assert_raise(TypeError) { class []::C2; end } end + +assert("remove_method doesn't segfault if the passed in argument isn't a symbol") do + klass = Class.new + assert_raise(TypeError) { klass.remove_method nil } + assert_raise(TypeError) { klass.remove_method 123 } + assert_raise(TypeError) { klass.remove_method 1.23 } + assert_raise(NameError) { klass.remove_method "hello" } + assert_raise(TypeError) { klass.remove_method Class.new } +end |