From 1849a2baf1823c7620b1d59b5924cc74211a68ce Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 2 Aug 2010 12:51:18 +0000
Subject: * ruby.c (ruby_init_loadpath_safe): rb_str_set_len modifies ptr  
 since r26303.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ruby.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ruby.c')

diff --git a/ruby.c b/ruby.c
index 1a445ea6cd..5196b0faf0 100644
--- a/ruby.c
+++ b/ruby.c
@@ -422,13 +422,15 @@ ruby_init_loadpath_safe(int safe_level)
 	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)
-- 
cgit v1.2.3