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

* string.c (str_utf8_nth): fixed overrun. [ruby-core:26787]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-11-17 23:41:44 +00:00
parent 9325910037
commit e43c0bde53
3 changed files with 10 additions and 0 deletions

View file

@ -1,3 +1,7 @@
Wed Nov 18 08:41:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_utf8_nth): fixed overrun. [ruby-core:26787]
Wed Nov 18 07:51:01 2009 Tanaka Akira <akr@fsij.org>
* io.c (parse_mode_enc): fix invalid access.

View file

@ -1483,6 +1483,7 @@ str_utf8_nth(const char *p, const char *e, long nth)
} while (s < t && (int)sizeof(VALUE) <= nth);
p = (char *)s;
}
if (p > e) return 0;
while (p < e) {
if (is_utf8_lead_byte(*p)) {
if (nth == 0) break;

View file

@ -867,6 +867,11 @@ class TestM17N < Test::Unit::TestCase
assert_equal(nil, u("\xc2\xa1\xc2\xa2\xc2\xa3")[u("\xa1\xc2")])
assert_raise(Encoding::CompatibilityError) { u("\xc2\xa1\xc2\xa2\xc2\xa3")[a("\xa1\xc2")] }
assert_nil(e("\xa1\xa2\xa3\xa4")[e("\xa2\xa3")])
bug2379 = '[ruby-core:26787]'
assert_equal("\u{439}", "\u{439}"[0, 30], bug2379)
assert_equal("\u{439}", "a\u{439}"[1, 30], bug2379)
assert_equal("\u{439}", "a\u{439}bcdefghijklmnop"[1, 1][0, 1], bug2379)
end
def test_aset