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

* ext/zlib/zlib.c (rb_gzwriter_write): conversion should be done

Browse source 
using to_str, not to_s.

* ext/zlib/zlib.c (rb_gzwriter_write): need proper conversion
  according to gz encoding.

* ext/zlib/zlib.c (rb_gzreader_ungetc): convert string encoding
  before unget.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-10-21 12:56:48 +00:00
parent ac466de7ff
commit 42a6550027
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Tue Oct 21 21:52:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/zlib/zlib.c (rb_gzwriter_write): conversion should be done
using to_str, not to_s.
* ext/zlib/zlib.c (rb_gzwriter_write): need proper conversion
according to gz encoding.
* ext/zlib/zlib.c (rb_gzreader_ungetc): convert string encoding
before unget.
Tue Oct 21 21:33:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 21 21:33:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit.rb (assert_nothing_raised): raise with backtrace. * lib/test/unit.rb (assert_nothing_raised): raise with backtrace.

11
ext/zlib/zlib.c
View file

@ -2747,10 +2747,10 @@ rb_gzwriter_write(VALUE obj, VALUE str)
{ {
struct gzfile *gz = get_gzfile(obj); struct gzfile *gz = get_gzfile(obj);
if (TYPE(str) != T_STRING) { StringValue(str);
str = rb_obj_as_string(str); if (gz->enc2 && gz->enc2 != rb_ascii8bit_encoding()) {
str = rb_str_conv_enc(str, rb_enc_get(str), gz->enc2);
} }
str = rb_str_export(str);
gzfile_write(gz, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str)); gzfile_write(gz, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
return INT2FIX(RSTRING_LEN(str)); return INT2FIX(RSTRING_LEN(str));
} }
@ -3075,6 +3075,11 @@ static VALUE
rb_gzreader_ungetc(VALUE obj, VALUE s) rb_gzreader_ungetc(VALUE obj, VALUE s)
{ {
struct gzfile *gz = get_gzfile(obj); struct gzfile *gz = get_gzfile(obj);
StringValue(s);
if (gz->enc2 && gz->enc2 != rb_ascii8bit_encoding()) {
s = rb_str_conv_enc(s, rb_enc_get(s), gz->enc2);
}
gzfile_ungets(gz, (const Bytef*)RSTRING_PTR(s), RSTRING_LEN(s)); gzfile_ungets(gz, (const Bytef*)RSTRING_PTR(s), RSTRING_LEN(s));
return Qnil; return Qnil;
} }

2
test/zlib/test_zlib.rb
View file

@ -597,7 +597,7 @@ if defined? Zlib
assert_equal("foo", Zlib::GzipReader.open(t.path) {|gz| gz.read }) assert_equal("foo", Zlib::GzipReader.open(t.path) {|gz| gz.read })
o = Object.new o = Object.new
def o.to_s; "bar"; end def o.to_str; "bar"; end
Zlib::GzipWriter.open(t.path) {|gz| gz.print(o) } Zlib::GzipWriter.open(t.path) {|gz| gz.print(o) }
assert_equal("bar", Zlib::GzipReader.open(t.path) {|gz| gz.read }) assert_equal("bar", Zlib::GzipReader.open(t.path) {|gz| gz.read })
end end