diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-24 13:46:04 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-24 13:46:04 +0000 |
| commit | cafc5a30805e647d7920343cc7056d95263f58b8 (patch) | |
| tree | 92aa673c75956611d76dc2b2dcfa6cbeb7dd70f0 /encoding.c | |
| parent | 57b26f83051d13442ffa6269230ea9d5803b6d1b (diff) | |
merge revision(s) 43376: [Backport #9038]
* encoding.c (load_encoding): should preserve outer errinfo, so that
expected exception may not be lost. [ruby-core:57949] [Bug #9038]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index c94dc90a7e..26a87913dc 100644 --- a/encoding.c +++ b/encoding.c @@ -582,6 +582,7 @@ load_encoding(const char *name) VALUE enclib = rb_sprintf("enc/%s.so", name); VALUE verbose = ruby_verbose; VALUE debug = ruby_debug; + VALUE errinfo; VALUE loaded; char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3; int idx; @@ -595,10 +596,11 @@ load_encoding(const char *name) OBJ_FREEZE(enclib); ruby_verbose = Qfalse; ruby_debug = Qfalse; + errinfo = rb_errinfo(); loaded = rb_protect(require_enc, enclib, 0); ruby_verbose = verbose; ruby_debug = debug; - rb_set_errinfo(Qnil); + rb_set_errinfo(errinfo); if (NIL_P(loaded)) return -1; if ((idx = rb_enc_registered(name)) < 0) return -1; if (enc_autoload_p(enc_table.list[idx].enc)) return -1; |