archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r24704 from trunk into ruby_1_9_1.

Browse source 
--
* ext/zlib/zlib.c (gzfile_read_all): use gzfile_newstr;
  set and convert its encoding. [ruby-dev:38304]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-10-28 16:11:37 +00:00
parent 3c0e4e61d6
commit f50e791c02
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Aug 30 01:15:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
* ext/zlib/zlib.c (gzfile_read_all): use gzfile_newstr;
set and convert its encoding. [ruby-dev:38304]
Thu Aug 27 18:31:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Aug 27 18:31:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_method.c (rb_remove_method_id): exported. * vm_method.c (rb_remove_method_id): exported.

2
ext/zlib/zlib.c
View file

@ -2198,7 +2198,7 @@ gzfile_read_all(struct gzfile *gz)
dst = zstream_detach_buffer(&gz->z); dst = zstream_detach_buffer(&gz->z);
gzfile_calc_crc(gz, dst); gzfile_calc_crc(gz, dst);
OBJ_TAINT(dst); OBJ_TAINT(dst);
return dst; return gzfile_newstr(gz, dst);
} }
static VALUE static VALUE

6
test/zlib/test_zlib.rb
View file

@ -442,10 +442,12 @@ if defined? Zlib
def test_read def test_read
t = Tempfile.new("test_zlib_gzip_reader") t = Tempfile.new("test_zlib_gzip_reader")
t.close t.close
Zlib::GzipWriter.open(t.path) {|gz| gz.print("foobar") } str = "\u3042\u3044\u3046"
Zlib::GzipWriter.open(t.path) {|gz| gz.print(str) }
f = Zlib::GzipReader.open(t.path) f = Zlib::GzipReader.open(t.path, encoding: "UTF-8")
assert_raise(ArgumentError) { f.read(-1) } assert_raise(ArgumentError) { f.read(-1) }
assert_equal(str, f.read)
end end
def test_readpartial def test_readpartial

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 306 #define RUBY_PATCHLEVEL 307
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1