diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-16 09:02:12 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-16 09:02:12 +0000 |
| commit | 7eeba5f440975912a63ee6e9da014c4a727cb565 (patch) | |
| tree | f42c40e7fe290c2f8923fddd828bf985ace80302 /encoding.c | |
| parent | de7c3793c0d0e842fff98bb64910be77fd4c7a22 (diff) | |
* encoding.c (rb_enc_compatible): empty strings are always compatible.
* string.c (rb_enc_cr_str_buf_cat): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index da89d8ac70..335d1ae00c 100644 --- a/encoding.c +++ b/encoding.c @@ -664,8 +664,15 @@ rb_enc_compatible(VALUE str1, VALUE str2) } enc1 = rb_enc_from_index(idx1); enc2 = rb_enc_from_index(idx2); - if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) + + if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) { + if (TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0) + return enc1; + if (TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0) + return enc2; return 0; + } + if (BUILTIN_TYPE(str1) != T_STRING) { VALUE tmp = str1; int idx0 = idx1; |