nobu	2008-11-25 16:09:39 +0900 (Tue, 25 Nov 2008)

  New Revision: 20354

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

  Log:
    * string.c (str_independent): no independent string points null_str.
      [ruby-core:20082]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/string.c

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 20353)
+++ ruby_1_8/ChangeLog	(revision 20354)
@@ -1,3 +1,8 @@
+Tue Nov 25 16:09:36 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (str_independent): no independent string points null_str.
+	  [ruby-core:20082]
+
 Tue Nov 25 03:37:42 2008  Hidetoshi NAGAI  <nagai@a...>
 
 	* ext/tk/lib/tkextlib/blt/tabset.rb, 
Index: ruby_1_8/string.c
===================================================================
--- ruby_1_8/string.c	(revision 20353)
+++ ruby_1_8/string.c	(revision 20354)
@@ -471,6 +471,8 @@
     return rb_str_format(1, &arg, str);
 }
 
+static const char null_str[] = "";
+
 static int
 str_independent(str)
     VALUE str;
@@ -481,6 +483,7 @@
     if (OBJ_FROZEN(str)) rb_error_frozen("string");
     if (!OBJ_TAINTED(str) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify string");
+    if (RSTRING(str)->ptr == null_str) return 0;
     if (!FL_TEST(str, ELTS_SHARED)) return 1;
     return 0;
 }
@@ -539,7 +542,6 @@
     return Qfalse;
 }
 
-static const char null_str[] = "";
 #define make_null_str(s) do { \
 	FL_SET(s, ELTS_SHARED); \
 	RSTRING(s)->ptr = (char *)null_str; \

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