зеркало из https://github.com/github/ruby.git
* ext/zlib/zlib.c (zstream_run_func): don't call inflate() when
z->stream.avail_in == 0. it return Z_BUF_ERROR. but deflate() could be called with z->stream->avail_in == 0 because it has hidden buffer in z->stream->state (opaque structure). fix for gem install error. [ruby-dev:46149] [Bug #7040] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
1bb89a6dea
Коммит
f21ac99ef9
|
@ -1,3 +1,11 @@
|
|||
Sun Oct 7 23:54:33 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
|
||||
|
||||
* ext/zlib/zlib.c (zstream_run_func): don't call inflate() when
|
||||
z->stream.avail_in == 0. it return Z_BUF_ERROR.
|
||||
but deflate() could be called with z->stream->avail_in == 0 because
|
||||
it has hidden buffer in z->stream->state (opaque structure).
|
||||
fix for gem install error. [ruby-dev:46149] [Bug #7040]
|
||||
|
||||
Mon Oct 8 23:55:41 2012 Shugo Maeda <shugo@ruby-lang.org>
|
||||
|
||||
* eval.c (rb_mod_refinements): new method Module#refinements.
|
||||
|
|
|
@ -990,6 +990,14 @@ zstream_run_func(void *ptr)
|
|||
break;
|
||||
}
|
||||
|
||||
if (z->stream.avail_in == 0 && z->func == &inflate_funcs) {
|
||||
/* break here because inflate() return Z_BUF_ERROR when avail_in == 0. */
|
||||
/* but deflate() could be called with avail_in == 0 (there's hidden buffer
|
||||
in zstream->state) */
|
||||
z->flags |= ZSTREAM_FLAG_IN_STREAM;
|
||||
break;
|
||||
}
|
||||
|
||||
if (args->stream_output) {
|
||||
state = (int)(VALUE)rb_thread_call_with_gvl(zstream_expand_buffer_protect,
|
||||
(void *)z);
|
||||
|
|
Загрузка…
Ссылка в новой задаче