diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2024-03-21 15:56:32 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2024-04-23 16:04:41 +0900 |
| commit | 26ec606bcd2de68b457a9b36852b764a71083b25 (patch) | |
| tree | 8b76dcfd6c667cde1312598bdcda1337a221af00 | |
| parent | 3229fb9769790c650cd9d11e64648daf576e11fa (diff) | |
Merge StringIO 3.0.1.2
| -rw-r--r-- | ext/stringio/stringio.c | 4 | ||||
| -rw-r--r-- | test/stringio/test_stringio.rb | 25 |
2 files changed, 23 insertions, 6 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 7c34164d31..a2aef6b11c 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -12,7 +12,7 @@ **********************************************************************/ -#define STRINGIO_VERSION "3.0.1" +#define STRINGIO_VERSION "3.0.1.2" #include "ruby.h" #include "ruby/io.h" @@ -984,7 +984,7 @@ strio_unget_bytes(struct StringIO *ptr, const char *cp, long cl) len = RSTRING_LEN(str); rest = pos - len; if (cl > pos) { - long ex = (rest < 0 ? cl-pos : cl+rest); + long ex = cl - (rest < 0 ? pos : len); rb_str_modify_expand(str, ex); rb_str_set_len(str, len + ex); s = RSTRING_PTR(str); diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb index e91a625488..0a4b90ef96 100644 --- a/test/stringio/test_stringio.rb +++ b/test/stringio/test_stringio.rb @@ -759,6 +759,15 @@ class TestStringIO < Test::Unit::TestCase assert_equal("b""\0""a", s.string) end + def test_ungetc_fill + count = 100 + s = StringIO.new + s.print 'a' * count + s.ungetc('b' * (count * 5)) + assert_equal((count * 5), s.string.size) + assert_match(/\Ab+\z/, s.string) + end + def test_ungetbyte_pos b = '\\b00010001 \\B00010001 \\b1 \\B1 \\b000100011' s = StringIO.new( b ) @@ -784,6 +793,15 @@ class TestStringIO < Test::Unit::TestCase assert_equal("b""\0""a", s.string) end + def test_ungetbyte_fill + count = 100 + s = StringIO.new + s.print 'a' * count + s.ungetbyte('b' * (count * 5)) + assert_equal((count * 5), s.string.size) + assert_match(/\Ab+\z/, s.string) + end + def test_frozen s = StringIO.new s.freeze @@ -827,18 +845,17 @@ class TestStringIO < Test::Unit::TestCase end def test_overflow - omit if RbConfig::SIZEOF["void*"] > RbConfig::SIZEOF["long"] + return if RbConfig::SIZEOF["void*"] > RbConfig::SIZEOF["long"] limit = RbConfig::LIMITS["INTPTR_MAX"] - 0x10 assert_separately(%w[-rstringio], "#{<<-"begin;"}\n#{<<-"end;"}") begin; limit = #{limit} ary = [] - while true + begin x = "a"*0x100000 break if [x].pack("p").unpack("i!")[0] < 0 ary << x - omit if ary.size > 100 - end + end while ary.size <= 100 s = StringIO.new(x) s.gets("xxx", limit) assert_equal(0x100000, s.pos) |