summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-30 21:54:32 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-30 21:54:32 +0000
commit5c988df0dd687ad74ef20506f5a57657ccae3014 (patch)
tree666a866e8cd0ca85162dcbcc841b5998ce91ada4
parentfb3313bf2b94e2d42352eab6267bbd8e98972b4e (diff)
string.c (rb_str_tmp_frozen_release): release embedded strings
Handle the embedded case first, since we may have an embedded duplicate and non-embedded original string. * string.c (rb_str_tmp_frozen_release): handled embedded strings * test/ruby/test_io.rb (test_write_no_garbage): new test [ruby-core:78898] [Bug #13085] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--string.c10
-rw-r--r--test/ruby/test_io.rb16
2 files changed, 21 insertions, 5 deletions
diff --git a/string.c b/string.c
index a65a423b8f2..3a7113dcc00 100644
--- a/string.c
+++ b/string.c
@@ -1150,7 +1150,11 @@ rb_str_tmp_frozen_release(VALUE orig, VALUE tmp)
if (RBASIC_CLASS(tmp) != 0)
return;
- if (FL_TEST_RAW(orig, STR_SHARED) &&
+ if (STR_EMBED_P(tmp)) {
+ assert(OBJ_FROZEN_RAW(tmp));
+ rb_gc_force_recycle(tmp);
+ }
+ else if (FL_TEST_RAW(orig, STR_SHARED) &&
!FL_TEST_RAW(orig, STR_TMPLOCK|RUBY_FL_FREEZE)) {
VALUE shared = RSTRING(orig)->as.heap.aux.shared;
@@ -1164,10 +1168,6 @@ rb_str_tmp_frozen_release(VALUE orig, VALUE tmp)
rb_gc_force_recycle(tmp);
}
}
- else if (STR_EMBED_P(tmp)) {
- assert(OBJ_FROZEN_RAW(tmp));
- rb_gc_force_recycle(tmp);
- }
}
static VALUE
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index b146e8e321c..c501edd0abb 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3504,5 +3504,21 @@ __END__
end
end
end
+
+ def test_write_no_garbage
+ res = {}
+ ObjectSpace.count_objects(res) # creates strings on first call
+ [ 'foo'.b, '*' * 24 ].each do |buf|
+ with_pipe do |r, w|
+ before = ObjectSpace.count_objects(res)[:T_STRING]
+ n = w.write(buf)
+ after = ObjectSpace.count_objects(res)[:T_STRING]
+ assert_equal before, after,
+ 'no strings left over after write [ruby-core:78898] [Bug #13085]'
+ assert_not_predicate buf, :frozen?, 'no inadvertant freeze'
+ assert_equal buf.bytesize, n, 'wrote expected size'
+ end
+ end
+ end
end
end