From ca93e00559d739170150cae27749d64fe07c37fe Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 8 Jul 2009 07:47:09 +0000 Subject: [PATCH] * file.c (rb_file_s_basename): returns new string instead of shared string from FilePathStringValue(). [ruby-core:24199] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 4 ++-- test/ruby/test_file_exhaustive.rb | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b531daa26..0f3e8fa592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 8 16:47:03 2009 Nobuyoshi Nakada + + * file.c (rb_file_s_basename): returns new string instead of + shared string from FilePathStringValue(). [ruby-core:24199] + 2009-07-07 Eric Hodel * ext/.document: Update with extensions that appear to have diff --git a/file.c b/file.c index 516737ddc2..f9dfc620ee 100644 --- a/file.c +++ b/file.c @@ -3104,7 +3104,7 @@ rb_file_s_basename(int argc, VALUE *argv) } FilePathStringValue(fname); if (RSTRING_LEN(fname) == 0 || !*(name = RSTRING_PTR(fname))) - return fname; + return rb_str_new_shared(fname); name = skipprefix(name); #if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC root = name; @@ -3146,7 +3146,7 @@ rb_file_s_basename(int argc, VALUE *argv) if (NIL_P(fext) || !(f = rmext(p, n, StringValueCStr(fext)))) { f = n; } - if (f == RSTRING_LEN(fname)) return fname; + if (f == RSTRING_LEN(fname)) return rb_str_new_shared(fname); } basename = rb_str_new(p, f); rb_enc_copy(basename, fname); diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index 67ac1037cb..881edb57ac 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -392,8 +392,10 @@ class TestFileExhaustive < Test::Unit::TestCase def test_basename assert_equal(File.basename(@file).sub(/\.test$/, ""), File.basename(@file, ".test")) - assert_equal("", File.basename("")) - assert_equal("foo", File.basename("foo")) + assert_equal("", s = File.basename("")) + assert(!s.frozen?, '[ruby-core:24199]') + assert_equal("foo", s = File.basename("foo")) + assert(!s.frozen?, '[ruby-core:24199]') assert_equal("foo", File.basename("foo", ".ext")) assert_equal("foo", File.basename("foo.ext", ".ext")) assert_equal("foo", File.basename("foo.ext", ".*"))