diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/stringio/stringio.c | 7 | ||||
-rw-r--r-- | ext/zlib/zlib.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index c223b8d95c..b907047137 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -13,6 +13,7 @@ #include "ruby.h" #include "ruby/io.h" +#include "ruby/encoding.h" #if defined(HAVE_FCNTL_H) || defined(_WIN32) #include <fcntl.h> #elif defined(HAVE_SYS_FCNTL_H) @@ -992,9 +993,15 @@ strio_write(VALUE self, VALUE str) { struct StringIO *ptr = writable(StringIO(self)); long len, olen; + rb_encoding *enc, *enc2; if (TYPE(str) != T_STRING) str = rb_obj_as_string(str); + enc = rb_enc_get(ptr->string); + enc2 = rb_enc_get(str); + if (enc != enc2 && enc != rb_ascii8bit_encoding()) { + str = rb_str_conv_enc(str, enc2, enc); + } len = RSTRING_LEN(str); if (len == 0) return INT2FIX(0); check_modifiable(ptr); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index bc0716b835..d2bcf76eb4 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -2747,7 +2747,8 @@ rb_gzwriter_write(VALUE obj, VALUE str) { struct gzfile *gz = get_gzfile(obj); - StringValue(str); + if (TYPE(str) != T_STRING) + 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); } |