diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-18 07:37:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-18 07:37:01 +0000 |
commit | 9c016c18fcf65332f8d6be099826df79ac12ebc0 (patch) | |
tree | 4bac4b24fe2c4d21268202a7e9bdce176d8e9d98 /ext | |
parent | 93ed2c7b1e0370287228c967c9973c9f2344fc54 (diff) | |
download | ruby-9c016c18fcf65332f8d6be099826df79ac12ebc0.tar.gz |
* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
disallow interrupt by type conversion. fixed: [ruby-dev:25226]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/zlib/zlib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index db3b6c8ed6..c0243a797d 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1205,18 +1205,19 @@ rb_deflate_s_deflate(argc, argv, klass) { struct zstream z; VALUE src, level, dst; - int err; + int err, lev; rb_scan_args(argc, argv, "11", &src, &level); + lev = ARG_LEVEL(level); + StringValue(src); zstream_init_deflate(&z); - err = deflateInit(&z.stream, ARG_LEVEL(level)); + err = deflateInit(&z.stream, lev); if (err != Z_OK) { raise_zlib_error(err, z.stream.msg); } ZSTREAM_READY(&z); - StringValue(src); zstream_run(&z, RSTRING(src)->ptr, RSTRING(src)->len, Z_FINISH); dst = zstream_detach_buffer(&z); zstream_end(&z); @@ -1457,6 +1458,7 @@ rb_inflate_s_inflate(obj, src) VALUE dst; int err; + StringValue(src); zstream_init_inflate(&z); err = inflateInit(&z.stream); if (err != Z_OK) { @@ -1464,7 +1466,6 @@ rb_inflate_s_inflate(obj, src) } ZSTREAM_READY(&z); - StringValue(src); zstream_run(&z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH); zstream_run(&z, "", 0, Z_FINISH); /* for checking errors */ dst = zstream_detach_buffer(&z); |