From 2270365bde104a118b60541fd5d99a040b3d7da2 Mon Sep 17 00:00:00 2001 From: mame Date: Fri, 13 Feb 2015 13:06:58 +0000 Subject: * string.c (str_discard): does not free for STR_NOFREE string. [Bug #10853][ruby-core:68110] * bootstraptest/test_string.rb: test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ bootstraptest/test_string.rb | 3 +++ string.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 bootstraptest/test_string.rb diff --git a/ChangeLog b/ChangeLog index d14807b474..f0bbe1eed9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Feb 13 21:52:05 2015 Yusuke Endoh + + * string.c (str_discard): does not free for STR_NOFREE string. + [Bug #10853][ruby-core:68110] + + * bootstraptest/test_string.rb: test for above. + Fri Feb 13 21:16:00 2015 Yusuke Endoh * lib/base64.rb: make urlsafe mode user-friendly. diff --git a/bootstraptest/test_string.rb b/bootstraptest/test_string.rb new file mode 100644 index 0000000000..849dcd45b0 --- /dev/null +++ b/bootstraptest/test_string.rb @@ -0,0 +1,3 @@ +assert_normal_exit %q{ + inspect.clear +}, '[ruby-core:68110]' diff --git a/string.c b/string.c index 5de795a29a..d810213160 100644 --- a/string.c +++ b/string.c @@ -1662,7 +1662,7 @@ static inline void str_discard(VALUE str) { str_modifiable(str); - if (!STR_SHARED_P(str) && !STR_EMBED_P(str)) { + if (!STR_EMBED_P(str) && !FL_TEST(str, STR_SHARED|STR_NOFREE)) { ruby_sized_xfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str)); RSTRING(str)->as.heap.ptr = 0; RSTRING(str)->as.heap.len = 0; -- cgit v1.2.3