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

merges r21861 from trunk into ruby_1_9_1.

Browse source 
* ext/zlib/zlib.c (zstream_run): previous change didn't resolve the
	  problem.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-01-29 17:12:16 +00:00
parent 2ad225c289
commit bd0ba009d1
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jan 29 00:24:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/zlib/zlib.c (zstream_run): previous change didn't resolve the
problem.
Fri Jan 30 01:39:27 2009 Yusuke Endoh <mame@tsg.ne.jp>
* parse.y (top_compstmt, top_stmts, top_stmt): prohibit BEGIN {} in

5
ext/zlib/zlib.c
View file

@ -708,7 +708,7 @@ zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
/* keep reference to `z->input' so as not to be garbage collected
after zstream_reset_input() and prevent `z->stream.next_in'
from dangling. */
RB_GC_GUARD(guard) = z->input;
guard = z->input;
}
if (z->stream.avail_out == 0) {
@ -716,6 +716,9 @@ zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
}
for (;;) {
/* VC allocates err and guard to same address. accessing err and guard
in same scope prevents it. */
RB_GC_GUARD(guard);
n = z->stream.avail_out;
err = z->func->run(&z->stream, flush);
z->buf_filled += n - z->stream.avail_out;