yugui	2010-08-09 00:03:23 +0900 (Mon, 09 Aug 2010)

  New Revision: 28928

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

  Log:
    merges r28836 from trunk into ruby_1_9_2.
    --
    * ruby.c (ruby_init_loadpath_safe): rb_str_set_len modifies ptr
      since r26303.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ruby.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28927)
+++ ruby_1_9_2/ChangeLog	(revision 28928)
@@ -1,3 +1,8 @@
+Mon Aug  2 21:51:16 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (ruby_init_loadpath_safe): rb_str_set_len modifies ptr
+	  since r26303.
+
 Mon Aug  2 21:16:03 2010  Masaki Suketa <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc
Index: ruby_1_9_2/ruby.c
===================================================================
--- ruby_1_9_2/ruby.c	(revision 28927)
+++ ruby_1_9_2/ruby.c	(revision 28928)
@@ -419,13 +419,15 @@
 	strlcpy(libpath, ".", sizeof(libpath));
 	p = libpath + 1;
     }
+    baselen = p - libpath;
 #define PREFIX_PATH() rb_str_new(libpath, baselen)
 #else
-    rb_str_set_len(sopath, p - libpath);
+    baselen = p - libpath;
+    rb_str_set_len(sopath, baselen);
+    libpath = RSTRING_PTR(sopath);
 #define PREFIX_PATH() sopath
 #endif
 
-    baselen = p - libpath;
 #define BASEPATH() rb_str_buf_cat(rb_str_buf_new(baselen+len), libpath, baselen)
 
 #define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), path, len)

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