From d68e5dce35ae300f7ea9ce7a0083f2b61392b997 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 18 Oct 2009 09:32:02 +0000 Subject: [PATCH] * ruby.c (ruby_init_loadpath_safe): should not dup tmp string. a patch from neomjp neomjp in [ruby-core:24251]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ruby.c | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4ee21c9c9..5986b240f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Oct 18 18:31:58 2009 Nobuyoshi Nakada + + * ruby.c (ruby_init_loadpath_safe): should not dup tmp string. a + patch from neomjp neomjp in [ruby-core:24251]. + Sun Oct 18 09:49:14 2009 Yuki Sonoda (Yugui) * test/test_prime.rb diff --git a/ruby.c b/ruby.c index 4f2f7d4b5a..1530306678 100644 --- a/ruby.c +++ b/ruby.c @@ -350,8 +350,8 @@ ruby_init_loadpath_safe(int safe_level) VALUE sopath; # else char libpath[MAXPATHLEN + 1]; - size_t baselen; # endif + size_t baselen; char *p; #if defined _WIN32 || defined __CYGWIN__ @@ -416,16 +416,13 @@ ruby_init_loadpath_safe(int safe_level) strlcpy(libpath, ".", sizeof(libpath)); p = libpath + 1; } - - baselen = p - libpath; - -#define BASEPATH() rb_str_buf_cat(rb_str_buf_new(baselen+len), libpath, baselen) #else rb_str_set_len(sopath, p - libpath); - -#define BASEPATH() rb_str_dup(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) #else #define RUBY_RELATIVE(path, len) rubylib_mangled_path(path, len)