summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-02 12:51:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-02 12:51:18 +0000
commit1849a2baf1823c7620b1d59b5924cc74211a68ce (patch)
tree8c4fd21f85f82e44ac2a246a342cfd14538e4624 /ruby.c
parentd4fc0799b7cc9fbb7af1bcc6580e1e3091dd087b (diff)
* 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
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c6
1 files changed, 4 insertions, 2 deletions
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)