kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[Bug #18973] Promote US-ASCII to ASCII-8BIT when adding 8-bit char

Browse source
This commit is contained in:
Nobuyoshi Nakada 2022-08-30 18:12:08 +09:00
parent 9dc60653db
commit 576bdec03f
Notes: git 2022-08-31 17:28:30 +09:00 
Merged: https://github.com/ruby/ruby/pull/6306
4 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/string.h
View file

@ -43,6 +43,7 @@ char *rb_str_to_cstr(VALUE str);
const char *ruby_escaped_char(int c); const char *ruby_escaped_char(int c);
void rb_str_make_independent(VALUE str); void rb_str_make_independent(VALUE str);
int rb_enc_str_coderange_scan(VALUE str, rb_encoding *enc); int rb_enc_str_coderange_scan(VALUE str, rb_encoding *enc);
int rb_ascii8bit_appendable_encoding_index(rb_encoding *enc, unsigned int code);
static inline bool STR_EMBED_P(VALUE str); static inline bool STR_EMBED_P(VALUE str);
static inline bool STR_SHARED_P(VALUE str); static inline bool STR_SHARED_P(VALUE str);

9
sprintf.c
View file

@ -454,13 +454,18 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
str = tmp; str = tmp;
goto format_s1; goto format_s1;
} }
else {
n = NUM2INT(val); n = NUM2INT(val);
if (n >= 0) n = rb_enc_codelen((c = n), enc); if (n >= 0) n = rb_enc_codelen((c = n), enc);
}
if (n <= 0) { if (n <= 0) {
rb_raise(rb_eArgError, "invalid character"); rb_raise(rb_eArgError, "invalid character");
} }
int encidx = rb_ascii8bit_appendable_encoding_index(enc, c);
if (encidx >= 0 && encidx != rb_enc_to_index(enc)) {
/* special case */
rb_enc_associate_index(result, encidx);
enc = rb_enc_from_index(encidx);
coderange = ENC_CODERANGE_VALID;
}
if (!(flags & FWIDTH)) { if (!(flags & FWIDTH)) {
CHECK(n); CHECK(n);
rb_enc_mbcput(c, &buf[blen], enc); rb_enc_mbcput(c, &buf[blen], enc);

32
string.c
View file

@ -3481,17 +3481,13 @@ rb_str_concat(VALUE str1, VALUE str2)
return rb_str_append(str1, str2); return rb_str_append(str1, str2);
} }
encidx = rb_enc_to_index(enc); encidx = rb_ascii8bit_appendable_encoding_index(enc, code);
if (encidx == ENCINDEX_ASCII_8BIT || encidx == ENCINDEX_US_ASCII) { if (encidx >= 0) {
/* US-ASCII automatically extended to ASCII-8BIT */
char buf[1]; char buf[1];
buf[0] = (char)code; buf[0] = (char)code;
if (code > 0xFF) {
rb_raise(rb_eRangeError, "%u out of char range", code);
}
rb_str_cat(str1, buf, 1); rb_str_cat(str1, buf, 1);
if (encidx == ENCINDEX_US_ASCII && code > 127) { if (encidx != rb_enc_to_index(enc)) {
rb_enc_associate_index(str1, ENCINDEX_ASCII_8BIT); rb_enc_associate_index(str1, encidx);
ENC_CODERANGE_SET(str1, ENC_CODERANGE_VALID); ENC_CODERANGE_SET(str1, ENC_CODERANGE_VALID);
} }
} }
@ -3524,6 +3520,26 @@ rb_str_concat(VALUE str1, VALUE str2)
return str1; return str1;
} }
int
rb_ascii8bit_appendable_encoding_index(rb_encoding *enc, unsigned int code)
{
int encidx = rb_enc_to_index(enc);
if (encidx == ENCINDEX_ASCII_8BIT || encidx == ENCINDEX_US_ASCII) {
/* US-ASCII automatically extended to ASCII-8BIT */
if (code > 0xFF) {
rb_raise(rb_eRangeError, "%u out of char range", code);
}
if (encidx == ENCINDEX_US_ASCII && code > 127) {
return ENCINDEX_ASCII_8BIT;
}
return encidx;
}
else {
return -1;
}
}
/* /*
* call-seq: * call-seq:
* prepend(*other_strings) -> string * prepend(*other_strings) -> string

3
test/ruby/test_sprintf.rb
View file

@ -369,6 +369,9 @@ class TestSprintf < Test::Unit::TestCase
assert_equal(" " * BSIZ + "a", sprintf("%#{ BSIZ + 1 }c", ?a)) assert_equal(" " * BSIZ + "a", sprintf("%#{ BSIZ + 1 }c", ?a))
assert_equal("a" + " " * BSIZ, sprintf("%-#{ BSIZ + 1 }c", ?a)) assert_equal("a" + " " * BSIZ, sprintf("%-#{ BSIZ + 1 }c", ?a))
assert_raise(ArgumentError) { sprintf("%c", -1) } assert_raise(ArgumentError) { sprintf("%c", -1) }
s = sprintf("%c".encode(Encoding::US_ASCII), 0x80)
assert_equal("\x80".b, s)
assert_predicate(s, :valid_encoding?)
end end
def test_string def test_string