summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <[email protected]>2022-08-20 00:16:43 +0900
committerNobuyoshi Nakada <[email protected]>2022-08-20 03:57:13 +0900
commitce384ef5a95b809f248e089c1608e60753dabe45 ()
tree8628b9c8480e6f0601f5e4a540781a4edfeadc30
parent4177f60eedd71b846d9a86889fd46071ecdb0158 (diff)
[Bug #18955] Check length of argument for `%c` in proper encoding
Notes: Merged: https://.com/ruby/ruby/pull/6258
-rw-r--r--sprintf.c5
-rw-r--r--test/ruby/test_m17n.rb2
2 files changed, 5 insertions, 2 deletions
@@ -441,10 +441,11 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
tmp = rb_check_string_type(val);
if (!NIL_P(tmp)) {
- if (rb_enc_strlen(RSTRING_PTR(tmp),RSTRING_END(tmp),enc) != 1) {
rb_raise(rb_eArgError, "%%c requires a character");
}
- c = rb_enc_codepoint_len(RSTRING_PTR(tmp), RSTRING_END(tmp), &n, enc);
RB_GC_GUARD(tmp);
}
else {
@@ -892,6 +892,8 @@ class TestM17N < Test::Unit::TestCase
assert_raise(Encoding::CompatibilityError) {
"%s%s" % [s("\xc2\xa1"), e("\xc2\xa1")]
}
end
def test_sprintf_p