diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-13 14:50:12 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-13 14:50:12 +0000 |
commit | d61d9d5e8e5a6f7f56e54a2a35e82e209dad6e08 (patch) | |
tree | 030c6e016edc65f3e56f396093a5c1974f69cfcc /error.c | |
parent | ab6c8910f47a2b95f7338a182715ee0bee5ec45d (diff) | |
download | ruby-d61d9d5e8e5a6f7f56e54a2a35e82e209dad6e08.tar.gz |
* error.c (name_err_mesg_to_str): clear rb_thread_t::errinfo when
ignore exception under rb_protect().
* test/ruby/test_exception.rb (test_exception_in_name_error_to_str):
add a corresponding test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r-- | error.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1012,6 +1012,7 @@ name_err_mesg_to_str(VALUE obj) else { const char *desc = 0; VALUE d = 0, args[NAME_ERR_MESG_COUNT]; + int state = 0; obj = ptr[1]; switch (TYPE(obj)) { @@ -1025,7 +1026,9 @@ name_err_mesg_to_str(VALUE obj) desc = "false"; break; default: - d = rb_protect(rb_inspect, obj, 0); + d = rb_protect(rb_inspect, obj, &state); + if (state) + rb_set_errinfo(Qnil); if (NIL_P(d) || RSTRING_LEN(d) > 65) { d = rb_any_to_s(obj); } |