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 /string.c | |
parent | de7c3793c0d0e842fff98bb64910be77fd4c7a22 (diff) | |
download | ruby-7eeba5f440975912a63ee6e9da014c4a727cb565.tar.gz |
* 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 'string.c')
-rw-r--r-- | string.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -597,7 +597,6 @@ rb_enc_strlen(const char *p, const char *e, rb_encoding *enc) if (rb_enc_mbmaxlen(enc) == rb_enc_mbminlen(enc)) { return (e - p) / rb_enc_mbminlen(enc); } - else if (rb_enc_asciicompat(enc)) { c = 0; while (p < e) { @@ -1303,6 +1302,13 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *str_enc = rb_enc_from_index(str_encindex); rb_encoding *ptr_enc = rb_enc_from_index(ptr_encindex); if (!rb_enc_asciicompat(str_enc) || !rb_enc_asciicompat(ptr_enc)) { + if (len == 0) + return str; + if (RSTRING_LEN(str) == 0) { + rb_str_buf_cat(str, ptr, len); + ENCODING_CODERANGE_SET(str, ptr_encindex, ptr_cr); + return str; + } goto incompatible; } if (ptr_cr == ENC_CODERANGE_UNKNOWN) { |