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

string.c: raise at invalid byte sequence

Browse source 
* string.c (rb_str_count): raise at invalid byte sequence argument
  even if single-byte optimization is effective.
  [ruby-dev:48442] [Bug #10078]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-22 04:33:38 +00:00
parent 1a95e46cc6
commit d2d9257cd4
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
string.c
View file

@ -6075,15 +6075,17 @@ rb_str_count(int argc, VALUE *argv, VALUE str)
rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS); rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
for (i=0; i<argc; i++) { for (i=0; i<argc; i++) {
VALUE tstr = argv[i]; VALUE tstr = argv[i];
const unsigned char *utstr; const char *ptstr;
StringValue(tstr); StringValue(tstr);
enc = rb_enc_check(str, tstr); enc = rb_enc_check(str, tstr);
if (argc == 1 && RSTRING_LEN(tstr) == 1 && rb_enc_asciicompat(enc) && if (argc == 1 && RSTRING_LEN(tstr) == 1 && rb_enc_asciicompat(enc) &&
(utstr = (const OnigUChar *)RSTRING_PTR(tstr), ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc, utstr, utstr+1)) && (ptstr = RSTRING_PTR(tstr),
ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc, (const unsigned char *)ptstr, (const unsigned char *)ptstr+1)) &&
!is_broken_string(str)) { !is_broken_string(str)) {
int n = 0; int n = 0;
unsigned char c = utstr[0]; int clen;
unsigned char c = rb_enc_codepoint_len(ptstr, ptstr+1, &clen, enc);
s = RSTRING_PTR(str); s = RSTRING_PTR(str);
if (!s || RSTRING_LEN(str) == 0) return INT2FIX(0); if (!s || RSTRING_LEN(str) == 0) return INT2FIX(0);

12
test/ruby/test_m17n_comb.rb
View file

@ -88,7 +88,7 @@ class TestM17NComb < Test::Unit::TestCase
r r
end end
def assert_enccall(recv, meth, *args, &block) def encdumpcall(recv, meth, *args, &block)
desc = '' desc = ''
if String === recv if String === recv
desc << encdump(recv) desc << encdump(recv)
@ -111,6 +111,11 @@ class TestM17NComb < Test::Unit::TestCase
if block if block
desc << ' {}' desc << ' {}'
end end
desc
end
def assert_enccall(recv, meth, *args, &block)
desc = encdumpcall(recv, meth, *args, &block)
result = nil result = nil
assert_nothing_raised(desc) { assert_nothing_raised(desc) {
result = recv.send(meth, *args, &block) result = recv.send(meth, *args, &block)
@ -710,12 +715,13 @@ class TestM17NComb < Test::Unit::TestCase
def test_str_count def test_str_count
combination(STRINGS, STRINGS) {|s1, s2| combination(STRINGS, STRINGS) {|s1, s2|
desc = proc {encdumpcall(s1, :count, s2)}
if !s1.valid_encoding? || !s2.valid_encoding? if !s1.valid_encoding? || !s2.valid_encoding?
assert_raise(ArgumentError, Encoding::CompatibilityError) { s1.count(s2) } assert_raise(ArgumentError, Encoding::CompatibilityError, desc) { s1.count(s2) }
next next
end end
if !s1.ascii_only? && !s2.ascii_only? && s1.encoding != s2.encoding if !s1.ascii_only? && !s2.ascii_only? && s1.encoding != s2.encoding
assert_raise(Encoding::CompatibilityError) { s1.count(s2) } assert_raise(Encoding::CompatibilityError, desc) { s1.count(s2) }
next next
end end
n = enccall(s1, :count, s2) n = enccall(s1, :count, s2)