diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-02-14 00:22:12 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-02-14 00:22:12 +0900 |
| commit | 30aa5218543cd44df7c1d90a5c10cf6f622f5a8a (patch) | |
| tree | ad1bf7f27553f551563fce4ae80db0c2bcd831c8 /src/kernel.c | |
| parent | 719f700adf7598d0ad910dcd3a94aad2ef354033 (diff) | |
| download | mruby-30aa5218543cd44df7c1d90a5c10cf6f622f5a8a.tar.gz mruby-30aa5218543cd44df7c1d90a5c10cf6f622f5a8a.zip | |
Do not use mrb_funcall() if Hash#default is not overridden; ref #3421
This change reduces the recursion level, but does not solve the stack
overflow issue entirely.
Diffstat (limited to 'src/kernel.c')
| -rw-r--r-- | src/kernel.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/kernel.c b/src/kernel.c index 8b00d701b..02bb3c99b 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -28,15 +28,21 @@ typedef enum { NOEX_RESPONDS = 0x80 } mrb_method_flag_t; -static mrb_bool -mrb_obj_basic_to_s_p(mrb_state *mrb, mrb_value obj) +MRB_API mrb_bool +mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func) { - struct RProc *me = mrb_method_search(mrb, mrb_class(mrb, obj), mrb_intern_lit(mrb, "to_s")); - if (MRB_PROC_CFUNC_P(me) && (me->body.func == mrb_any_to_s)) + struct RProc *me = mrb_method_search(mrb, mrb_class(mrb, obj), mid); + if (MRB_PROC_CFUNC_P(me) && (me->body.func == func)) return TRUE; return FALSE; } +static mrb_bool +mrb_obj_basic_to_s_p(mrb_state *mrb, mrb_value obj) +{ + return mrb_func_basic_p(mrb, obj, mrb_intern_lit(mrb, "to_s"), mrb_any_to_s); +} + /* 15.3.1.3.17 */ /* * call-seq: |