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

* string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is

Browse Source 
not compatible with any other encoding.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-01-24 02:17:26 +00:00
parent e336136d8a
commit 968e404220
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Jan 24 11:14:56 2008 Tanaka Akira <akr@fsij.org>
* string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is
not compatible with any other encoding.
Thu Jan 24 07:34:34 2008 NARUSE, Yui <naruse@ruby-lang.org> Thu Jan 24 07:34:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
* parse.y (STR_NEW0): set encoding as US-ASCII. * parse.y (STR_NEW0): set encoding as US-ASCII.

8
string.c
View File

@ -1140,8 +1140,13 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
} }
} }
else { else {
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)) {
goto incompatible;
}
if (ptr_cr == ENC_CODERANGE_UNKNOWN) { if (ptr_cr == ENC_CODERANGE_UNKNOWN) {
ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex)); ptr_cr = coderange_scan(ptr, len, ptr_enc);
} }
if (str_cr == ENC_CODERANGE_UNKNOWN) { if (str_cr == ENC_CODERANGE_UNKNOWN) {
if (str_a8 || ptr_cr != ENC_CODERANGE_7BIT) { if (str_a8 || ptr_cr != ENC_CODERANGE_7BIT) {
@ -1155,6 +1160,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
if (str_encindex != ptr_encindex && if (str_encindex != ptr_encindex &&
str_cr != ENC_CODERANGE_7BIT && str_cr != ENC_CODERANGE_7BIT &&
ptr_cr != ENC_CODERANGE_7BIT) { ptr_cr != ENC_CODERANGE_7BIT) {
incompatible:
rb_raise(rb_eArgError, "append incompatible encoding strings: %s and %s", rb_raise(rb_eArgError, "append incompatible encoding strings: %s and %s",
rb_enc_name(rb_enc_from_index(str_encindex)), rb_enc_name(rb_enc_from_index(str_encindex)),
rb_enc_name(rb_enc_from_index(ptr_encindex))); rb_enc_name(rb_enc_from_index(ptr_encindex)));

8
test/ruby/test_utf16.rb
View File

@ -103,4 +103,12 @@ class TestUTF16 < Test::Unit::TestCase
def test_slice! def test_slice!
enccall("aa".force_encoding("UTF-16BE"), :slice!, -1) enccall("aa".force_encoding("UTF-16BE"), :slice!, -1)
end end
def test_concat
s1 = ""
s2 = "aa".force_encoding("utf-16be")
assert_raise(ArgumentError, "#{encdump s1} << #{encdump s2}") {
s1 << s2
}
end
end end