summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/zlib/zlib.c3
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a42940905..ee593ebe8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 21 07:33:54 2011 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
+ This caused failure when test/csv is executed with GC.stress = true.
+
Sat May 21 05:43:03 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
* eval.c (rb_thread_atfork): When a ruby process forks, its random
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index f52248cf47..98141b2f3f 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -610,7 +610,8 @@ zstream_append_input(z, src, len)
}
#define zstream_append_input2(z,v)\
- zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
+ RB_GC_GUARD(v),\
+ zstream_append_input((z), (Bytef*)RSTRING_PTR(v), RSTRING_LEN(v))
static void
zstream_discard_input(z, len)
diff --git a/version.h b/version.h
index ef23dc525f..70e7bec5b8 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2011-05-23"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20110523
-#define RUBY_PATCHLEVEL 345
+#define RUBY_PATCHLEVEL 346
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8