diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-11 08:03:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-11 08:03:43 +0000 |
| commit | aa2b32ae4bac4e1fcfc5986977d9111b32d0458e (patch) | |
| tree | 8f716d6df2b6a4e00349b9c4d7958a94d02cc3b1 /eval_error.c | |
| parent | a7c7cfb874a96d7e5c48e6a417737c7d52684f27 (diff) | |
| download | ruby-aa2b32ae4bac4e1fcfc5986977d9111b32d0458e.tar.gz | |
eval_error.c: fix loop on exception in message
* error.c (rb_get_message): accessor to the message.
* eval_error.c (rb_ec_error_print): handle exceptions on fetching
the message. [Bug #14566]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_error.c')
| -rw-r--r-- | eval_error.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/eval_error.c b/eval_error.c index 5495a36c19..99941163d5 100644 --- a/eval_error.c +++ b/eval_error.c @@ -221,9 +221,9 @@ print_backtrace(const VALUE eclass, const VALUE errat, const VALUE str, int reve } void -rb_error_write(VALUE errinfo, VALUE errat, VALUE str, VALUE highlight, VALUE reverse) +rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlight, VALUE reverse) { - volatile VALUE eclass = Qundef, emesg = Qundef; + volatile VALUE eclass; if (NIL_P(errinfo)) return; @@ -231,13 +231,7 @@ rb_error_write(VALUE errinfo, VALUE errat, VALUE str, VALUE highlight, VALUE rev if (errat == Qundef) { errat = Qnil; } - if ((eclass = CLASS_OF(errinfo)) != Qundef) { - VALUE e = rb_check_funcall(errinfo, rb_intern("message"), 0, 0); - if (e != Qundef) { - if (!RB_TYPE_P(e, T_STRING)) e = rb_check_string_type(e); - emesg = e; - } - } + eclass = CLASS_OF(errinfo); if (NIL_P(reverse) || NIL_P(highlight)) { VALUE tty = (VALUE)rb_stderr_tty_p(); if (NIL_P(reverse)) reverse = tty; @@ -269,11 +263,14 @@ rb_error_write(VALUE errinfo, VALUE errat, VALUE str, VALUE highlight, VALUE rev } } +VALUE rb_get_message(VALUE exc); + void rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo) { volatile int raised_flag = ec->raised_flag; volatile VALUE errat = Qundef; + volatile VALUE emesg = Qundef; if (NIL_P(errinfo)) return; @@ -283,8 +280,12 @@ rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo) if (EC_EXEC_TAG() == TAG_NONE) { errat = rb_get_backtrace(errinfo); } + if (emesg == Qundef) { + emesg = Qnil; + emesg = rb_get_message(errinfo); + } - rb_error_write(errinfo, errat, Qnil, Qnil, Qnil); + rb_error_write(errinfo, emesg, errat, Qnil, Qnil, Qnil); EC_POP_TAG(); ec->errinfo = errinfo; |