aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-16 04:19:29 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-16 04:19:29 +0000
commit10a8e87ce579d7c6d73acdf0d37403902a4f372d (patch)
tree4cf7c77d5ed50c009d5aef78cf514f6969b5e3cf
parentf97051512aad857eed0b3ed8676c4c123f6a01c4 (diff)
downloadruby-10a8e87ce579d7c6d73acdf0d37403902a4f372d.tar.gz
io.c (rb_f_backquote): trade volatile for manual recycle
* io.c (rb_f_backquote): trade volatile for manual recycle rb_gc_force_recycle ensures object is visible until recycle git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6121db6371..4c4fe3f416 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 16 12:46:47 2014 Eric Wong <e@80x24.org>
+
+ * io.c (rb_f_backquote): trade volatile for manual recycle
+ rb_gc_force_recycle ensures object is visible until recycle
+
Sun Feb 16 11:55:14 2014 Eric Wong <e@80x24.org>
* marshal.c (marshal_dump): use rb_gc_force_recycle for GC-safety
diff --git a/io.c b/io.c
index e069239311..58688e5dbc 100644
--- a/io.c
+++ b/io.c
@@ -8227,7 +8227,7 @@ argf_readlines(int argc, VALUE *argv, VALUE argf)
static VALUE
rb_f_backquote(VALUE obj, VALUE str)
{
- volatile VALUE port;
+ VALUE port;
VALUE result;
rb_io_t *fptr;
@@ -8239,6 +8239,8 @@ rb_f_backquote(VALUE obj, VALUE str)
GetOpenFile(port, fptr);
result = read_all(fptr, remain_size(fptr), Qnil);
rb_io_close(port);
+ rb_io_fptr_finalize(fptr);
+ rb_gc_force_recycle(port); /* also guards from premature GC */
return result;
}