1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* encoding.c (rb_enc_compatible): wrong compatibility condition.

Browse Source 
[ruby-dev:33273]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-01-22 06:56:44 +00:00
parent 65a8185eb2
commit 707f2fd26e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@ Tue Jan 22 12:57:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* encoding.c (rb_enc_compatible): encoding must be ASCII
compatible before checking ENC_CODERANGE_7BIT.
* encoding.c (rb_enc_compatible): wrong compatibility condition.
[ruby-dev:33273]
Tue Jan 22 09:26:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_each_char): iterates over a shadow.

1
encoding.c
View File

@ -669,6 +669,7 @@ rb_enc_compatible(VALUE str1, VALUE str2)
if (cr1 != cr2) {
/* may need to handle ENC_CODERANGE_BROKEN */
if (cr1 == ENC_CODERANGE_7BIT) return enc2;
if (cr2 == ENC_CODERANGE_7BIT) return enc1;
}
if (cr2 == ENC_CODERANGE_7BIT) {
if (idx1 == 0) return enc2;