diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 22 | ||||
| -rw-r--r-- | test/ruby/test_encoding.rb | 6 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 28 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Mon Jan 23 18:18:58 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * encoding.c (rb_enc_compatible): fix segv on symbols. + [ruby-core:42204] [Bug #5921] + Tue Jan 17 17:18:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (SPT_TYPE): enable as SPT_REUSEARGV on Darwin. diff --git a/encoding.c b/encoding.c index 629fa04ee5..744be89223 100644 --- a/encoding.c +++ b/encoding.c @@ -750,6 +750,7 @@ rb_enc_compatible(VALUE str1, VALUE str2) { int idx1, idx2; rb_encoding *enc1, *enc2; + int isstr1, isstr2; idx1 = rb_enc_get_index(str1); idx2 = rb_enc_get_index(str2); @@ -763,33 +764,38 @@ rb_enc_compatible(VALUE str1, VALUE str2) enc1 = rb_enc_from_index(idx1); enc2 = rb_enc_from_index(idx2); - if (BUILTIN_TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0) + isstr2 = RB_TYPE_P(str2, T_STRING); + if (isstr2 && RSTRING_LEN(str2) == 0) return enc1; - if (BUILTIN_TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0) + isstr1 = RB_TYPE_P(str1, T_STRING); + if (isstr1 && RSTRING_LEN(str1) == 0) return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2; if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) { return 0; } /* objects whose encoding is the same of contents */ - if (BUILTIN_TYPE(str2) != T_STRING && idx2 == ENCINDEX_US_ASCII) + if (!isstr2 && idx2 == ENCINDEX_US_ASCII) return enc1; - if (BUILTIN_TYPE(str1) != T_STRING && idx1 == ENCINDEX_US_ASCII) + if (!isstr1 && idx1 == ENCINDEX_US_ASCII) return enc2; - if (BUILTIN_TYPE(str1) != T_STRING) { + if (!isstr1) { VALUE tmp = str1; int idx0 = idx1; str1 = str2; str2 = tmp; idx1 = idx2; idx2 = idx0; + idx0 = isstr1; + isstr1 = isstr2; + isstr2 = idx0; } - if (BUILTIN_TYPE(str1) == T_STRING) { + if (isstr1) { int cr1, cr2; cr1 = rb_enc_str_coderange(str1); - if (BUILTIN_TYPE(str2) == T_STRING) { + if (isstr2) { cr2 = rb_enc_str_coderange(str2); if (cr1 != cr2) { /* may need to handle ENC_CODERANGE_BROKEN */ @@ -1069,7 +1075,7 @@ enc_find(VALUE klass, VALUE enc) * * If the objects are non-strings their encodings are compatible when they * have an encoding and: - * * Either encoding is US ASCII compatible + * * Either encoding is US-ASCII compatible * * One of the encodings is a 7-bit encoding * */ diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index eaad03d302..e0a27ef6b6 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -101,4 +101,10 @@ class TestEncoding < Test::Unit::TestCase bug5279 = '[ruby-dev:44469]' assert_ruby_status([], '$SAFE=3; "a".encode("utf-16be")', bug5279) end + + def test_compatible_p + ua = "abc".force_encoding(Encoding::UTF_8) + assert_equal(Encoding::UTF_8, Encoding.compatible?(ua, :abc)) + assert_equal(nil, Encoding.compatible?(ua, 1)) + end end @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 27 +#define RUBY_PATCHLEVEL 28 -#define RUBY_RELEASE_DATE "2012-01-20" +#define RUBY_RELEASE_DATE "2012-01-23" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" |