diff options
| -rw-r--r-- | string.c | 14 | ||||
| -rw-r--r-- | test/ruby/test_m17n.rb | 2 |
2 files changed, 11 insertions, 5 deletions
@@ -9206,9 +9206,15 @@ rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl) int encidx; VALUE buf = Qnil; const char *rep; - long replen; + long replen = -1; int tainted = 0; + if (rb_block_given_p()) { + if (!NIL_P(repl)) + rb_raise(rb_eArgError, "both of block and replacement given"); + replen = 0; + } + if (ENC_CODERANGE_CLEAN_P(cr)) return Qnil; @@ -9232,9 +9238,8 @@ rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl) const char *e = RSTRING_END(str); const char *p1 = p; int rep7bit_p; - if (rb_block_given_p()) { + if (!replen) { rep = NULL; - replen = 0; rep7bit_p = FALSE; } else if (!NIL_P(repl)) { @@ -9345,9 +9350,8 @@ rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl) const char *e = RSTRING_END(str); const char *p1 = p; long mbminlen = rb_enc_mbminlen(enc); - if (rb_block_given_p()) { + if (!replen) { rep = NULL; - replen = 0; } else if (!NIL_P(repl)) { rep = RSTRING_PTR(repl); diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 44f19254dc..a16e49c27a 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1625,6 +1625,7 @@ class TestM17N < Test::Unit::TestCase assert_equal(u("\x81"), u("a\x81c").scrub {|c| break c}) assert_raise(ArgumentError) {u("a\x81").scrub {|c| c}} + assert_raise(ArgumentError) {u("a").scrub("?") {|c| c}} end def test_scrub_widechar @@ -1645,6 +1646,7 @@ class TestM17N < Test::Unit::TestCase "\x00\xD8\x42\x30".force_encoding(Encoding::UTF_16LE). scrub {|e| c = e; "?".encode(Encoding::UTF_16LE)}) assert_equal("\x00\xD8".force_encoding(Encoding::UTF_16LE), c) + assert_raise(ArgumentError) {"\uFFFD\u3042".encode("UTF-16BE").scrub("") {}} end def test_scrub_dummy_encoding |