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

[Bug #18956] Negative codepoints are invalid characters

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-08-20 01:43:04 +09:00
parent 8f4a53d051
commit d2483393cb
Notes: git 2022-08-20 10:06:37 +09:00 
Merged: https://github.com/ruby/ruby/pull/6259
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sprintf.c
View File

@ -447,8 +447,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
goto format_s1; goto format_s1;
} }
else { else {
c = NUM2INT(val); n = NUM2INT(val);
n = rb_enc_codelen(c, 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");

1
test/ruby/test_sprintf.rb
View File

@ -368,6 +368,7 @@ class TestSprintf < Test::Unit::TestCase
assert_equal(" " * (BSIZ - 1) + "a", sprintf(" " * (BSIZ - 1) + "%-1c", ?a)) assert_equal(" " * (BSIZ - 1) + "a", sprintf(" " * (BSIZ - 1) + "%-1c", ?a))
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) }
end end
def test_string def test_string