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

merges r30772,r30773 and r30776 from trunk into ruby_1_9_2.

Browse source 
--
* ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_new_shared
  because gz->z.input is hidden string. [ruby-core:35057]
--
e ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
--
* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
  before rb_str_resurrect.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-03-28 13:41:03 +00:00
parent bb40ff9216
commit 73dae42f51
4 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Fri Feb 4 00:14:55 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
before rb_str_resurrect.
Thu Feb 3 18:33:26 2011 NARUSE, Yui <naruse@ruby-lang.org>
e ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
because gz->z.input is hidden string. [ruby-core:35057]
Thu Feb 3 07:02:16 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular

2
ext/zlib/zlib.c
View file

@ -2400,7 +2400,7 @@ gzfile_reader_get_unused(struct gzfile *gz)
}
if (NIL_P(gz->z.input)) return Qnil;
str = rb_str_dup(gz->z.input);
str = rb_str_resurrect(gz->z.input);
OBJ_TAINT(str); /* for safe */
return str;
}

44
test/zlib/test_zlib.rb
View file

@ -86,7 +86,7 @@ if defined? Zlib
def test_adler
z = Zlib::Deflate.new
z << "foo"
s = z.finish
z.finish
assert_equal(0x02820145, z.adler)
end
@ -95,7 +95,7 @@ if defined? Zlib
assert_equal(false, z.finished?)
z << "foo"
assert_equal(false, z.finished?)
s = z.finish
z.finish
assert_equal(true, z.finished?)
z.close
assert_raise(Zlib::Error) { z.finished? }
@ -459,12 +459,40 @@ if defined? Zlib
t.close
Zlib::GzipWriter.open(t.path) {|gz| gz.print("foobar") }
f = Zlib::GzipReader.open(t.path)
assert_equal("foo", f.read(3))
f.unused
assert_equal("bar", f.read)
f.unused
f.close
Zlib::GzipReader.open(t.path) do |f|
assert_equal(nil, f.unused)
assert_equal("foo", f.read(3))
assert_equal(nil, f.unused)
assert_equal("bar", f.read)
assert_equal(nil, f.unused)
end
end
def test_unused2
zio = StringIO.new
io = Zlib::GzipWriter.new zio
io.write 'aaaa'
io.finish
io = Zlib::GzipWriter.new zio
io.write 'bbbb'
io.finish
zio.rewind
io = Zlib::GzipReader.new zio
assert_equal('aaaa', io.read)
unused = io.unused
assert_equal(24, unused.bytesize)
io.finish
zio.pos -= unused.length
io = Zlib::GzipReader.new zio
assert_equal('bbbb', io.read)
assert_equal(nil, io.unused)
io.finish
end
def test_read

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 187
#define RUBY_PATCHLEVEL 188
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1