naruse	2015-02-17 11:50:37 +0900 (Tue, 17 Feb 2015)

  New Revision: 49621

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49621

  Log:
    merge revision(s) 49586: [Backport #10853]
    
    * string.c (str_discard): does not free for STR_NOFREE string.
      [Bug #10853][ruby-core:68110]
    
    * bootstraptest/test_string.rb: test for above.

  Added files:
    branches/ruby_2_2/bootstraptest/test_string.rb
  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/string.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49620)
+++ ruby_2_2/ChangeLog	(revision 49621)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Feb 17 11:50:06 2015  Yusuke Endoh  <mame@t...>
+
+	* string.c (str_discard): does not free for STR_NOFREE string.
+	  [Bug #10853][ruby-core:68110]
+
+	* bootstraptest/test_string.rb: test for above.
+
 Sun Feb 15 13:15:46 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/socket/getaddrinfo.c (get_addr): reject too long hostname to
Index: ruby_2_2/bootstraptest/test_string.rb
===================================================================
--- ruby_2_2/bootstraptest/test_string.rb	(revision 0)
+++ ruby_2_2/bootstraptest/test_string.rb	(revision 49621)
@@ -0,0 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/bootstraptest/test_string.rb#L1
+assert_normal_exit %q{
+  inspect.clear
+}, '[ruby-core:68110]'
Index: ruby_2_2/string.c
===================================================================
--- ruby_2_2/string.c	(revision 49620)
+++ ruby_2_2/string.c	(revision 49621)
@@ -1658,7 +1658,7 @@ static inline void https://github.com/ruby/ruby/blob/trunk/ruby_2_2/string.c#L1658
 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;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49620)
+++ ruby_2_2/version.h	(revision 49621)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-02-15"
-#define RUBY_PATCHLEVEL 49
+#define RUBY_RELEASE_DATE "2015-02-17"
+#define RUBY_PATCHLEVEL 50
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 17
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49586


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/