archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 43376: [Backport #9038]

Browse source 
* 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
This commit is contained in:
nagachika 2013-10-24 13:46:04 +00:00
parent 57b26f8305
commit cafc5a3080
4 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Oct 24 22:36:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (load_encoding): should preserve outer errinfo, so that
expected exception may not be lost. [ruby-core:57949] [Bug #9038]
Fri Oct 18 02:10:00 2013 Shugo Maeda <shugo@ruby-lang.org> Fri Oct 18 02:10:00 2013 Shugo Maeda <shugo@ruby-lang.org>
* vm_insnhelper.c (vm_call_method): set ci->me to 0 when the * vm_insnhelper.c (vm_call_method): set ci->me to 0 when the

4
encoding.c
View file

@ -582,6 +582,7 @@ load_encoding(const char *name)
VALUE enclib = rb_sprintf("enc/%s.so", name); VALUE enclib = rb_sprintf("enc/%s.so", name);
VALUE verbose = ruby_verbose; VALUE verbose = ruby_verbose;
VALUE debug = ruby_debug; VALUE debug = ruby_debug;
VALUE errinfo;
VALUE loaded; VALUE loaded;
char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3; char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3;
int idx; int idx;
@ -595,10 +596,11 @@ load_encoding(const char *name)
OBJ_FREEZE(enclib); OBJ_FREEZE(enclib);
ruby_verbose = Qfalse; ruby_verbose = Qfalse;
ruby_debug = Qfalse; ruby_debug = Qfalse;
errinfo = rb_errinfo();
loaded = rb_protect(require_enc, enclib, 0); loaded = rb_protect(require_enc, enclib, 0);
ruby_verbose = verbose; ruby_verbose = verbose;
ruby_debug = debug; ruby_debug = debug;
rb_set_errinfo(Qnil); rb_set_errinfo(errinfo);
if (NIL_P(loaded)) return -1; if (NIL_P(loaded)) return -1;
if ((idx = rb_enc_registered(name)) < 0) return -1; if ((idx = rb_enc_registered(name)) < 0) return -1;
if (enc_autoload_p(enc_table.list[idx].enc)) return -1; if (enc_autoload_p(enc_table.list[idx].enc)) return -1;

8
test/ruby/test_encoding.rb
View file

@ -113,4 +113,12 @@ class TestEncoding < Test::Unit::TestCase
asc = "b".force_encoding(Encoding::US_ASCII) asc = "b".force_encoding(Encoding::US_ASCII)
assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc)) assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc))
end end
def test_errinfo_after_autoload
bug9038 = '[ruby-core:57949] [Bug #9038]'
assert_separately(%w[--disable=gems], <<-"end;")
e = assert_raise(SyntaxError) { eval("/regexp/sQ") }
assert_match(/unknown regexp option - Q/, e.message, #{bug9038.dump})
end;
end
end end

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-10-18" #define RUBY_RELEASE_DATE "2013-10-24"
#define RUBY_PATCHLEVEL 337 #define RUBY_PATCHLEVEL 338
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10
#define RUBY_RELEASE_DAY 18 #define RUBY_RELEASE_DAY 24
#include "ruby/version.h" #include "ruby/version.h"