diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-29 01:06:37 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-29 01:06:37 +0000 |
| commit | ce3c39c09b9a0c20c875a27a051f51ef808904d6 (patch) | |
| tree | fe00484c17f89c209107da7e600aa716996b4c16 /ext | |
| parent | 31bb1cb763e9b608e583a484c5e97d75d42c3990 (diff) | |
| download | ruby-ce3c39c09b9a0c20c875a27a051f51ef808904d6.tar.gz ruby-ce3c39c09b9a0c20c875a27a051f51ef808904d6.tar.xz ruby-ce3c39c09b9a0c20c875a27a051f51ef808904d6.zip | |
* eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
should be wrapped by PUSH_TAG/POP_TAG(). [ruby-dev:24627]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/zlib/zlib.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 21bcfbcff..db3b6c8ed 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -640,7 +640,13 @@ zstream_detach_input(z) { VALUE dst; - dst = NIL_P(z->input) ? rb_str_new(0, 0) : z->input; + if (NIL_P(z->input)) { + dst = rb_str_new(0, 0); + } + else { + dst = z->input; + RBASIC(dst)->klass = rb_cString; + } z->input = Qnil; RBASIC(dst)->klass = rb_cString; return dst; |