diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-13 08:03:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-13 08:03:31 +0000 |
| commit | 1bd8510674f4dc32c4f49453f7737dbd61c8b50c (patch) | |
| tree | 1addf2920073b136576797f6c48ed9c1ebcf64f8 | |
| parent | 13622fde3d65cc68f7a5fcf8a03216ccf8aa0cd7 (diff) | |
| download | ruby-1bd8510674f4dc32c4f49453f7737dbd61c8b50c.tar.gz ruby-1bd8510674f4dc32c4f49453f7737dbd61c8b50c.tar.xz ruby-1bd8510674f4dc32c4f49453f7737dbd61c8b50c.zip | |
* encoding.c (rb_enc_compatible): should swap encoding indexes too.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | encoding.c | 3 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Thu Dec 13 17:03:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (rb_enc_compatible): should swap encoding indexes too. + Thu Dec 13 16:41:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * encoding.c (rb_enc_compatible): should not judge compatibility diff --git a/encoding.c b/encoding.c index 94577a1b2..ef3b89d7b 100644 --- a/encoding.c +++ b/encoding.c @@ -390,8 +390,11 @@ rb_enc_compatible(VALUE str1, VALUE str2) } if (BUILTIN_TYPE(str1) != T_STRING) { VALUE tmp = str1; + int idx0 = idx1; str1 = str2; str2 = tmp; + idx1 = idx2; + idx2 = idx0; } if (BUILTIN_TYPE(str1) == T_STRING) { int cr1, cr2; |