nobu	2013-10-17 14:21:38 +0900 (Thu, 17 Oct 2013)

  New Revision: 43328

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

  Log:
    file.c: fix memory leak
    
    * win32/file.c (rb_file_expand_path_internal): fix memory leaks at
      a non-absolute home exception.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_file_exhaustive.rb
    trunk/win32/file.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43327)
+++ ChangeLog	(revision 43328)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Oct 17 14:21:34 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/file.c (rb_file_expand_path_internal): fix memory leaks at
+	  a non-absolute home exception.
+
 Thu Oct 17 14:06:39 2013  Koichi Sasada  <ko1@a...>
 
 	* ext/objspace/object_tracing.c (newobj_i): fix memory leak.
Index: win32/file.c
===================================================================
--- win32/file.c	(revision 43327)
+++ win32/file.c	(revision 43328)
@@ -373,6 +373,7 @@ rb_file_expand_path_internal(VALUE fname https://github.com/ruby/ruby/blob/trunk/win32/file.c#L373
 
 	if (PathIsRelativeW(whome) && !(whome_len >= 2 && IS_DIR_UNC_P(whome))) {
 	    xfree(wpath);
+	    xfree(whome);
 	    rb_raise(rb_eArgError, "non-absolute home");
 	}
 
@@ -441,6 +442,7 @@ rb_file_expand_path_internal(VALUE fname https://github.com/ruby/ruby/blob/trunk/win32/file.c#L442
 	    if (PathIsRelativeW(whome) && !(whome_len >= 2 && IS_DIR_UNC_P(whome))) {
 		xfree(wpath);
 		xfree(wdir);
+		xfree(whome);
 		rb_raise(rb_eArgError, "non-absolute home");
 	    }
 
Index: test/ruby/test_file_exhaustive.rb
===================================================================
--- test/ruby/test_file_exhaustive.rb	(revision 43327)
+++ test/ruby/test_file_exhaustive.rb	(revision 43328)
@@ -519,6 +519,33 @@ class TestFileExhaustive < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file_exhaustive.rb#L519
     ENV["HOME"] = home
   end
 
+  if /mswin|mingw/ =~ RUBY_PLATFORM
+    def test_expand_path_home_memory_leak_in_path
+      assert_no_memory_leak_at_expand_path_home('', 'in path')
+    end
+
+    def test_expand_path_home_memory_leak_in_base
+      assert_no_memory_leak_at_expand_path_home('".",', 'in base')
+    end
+
+    def assert_no_memory_leak_at_expand_path_home(arg, message)
+      prep = 'ENV["HOME"] = "foo"*100'
+      assert_no_memory_leak([], prep, <<-TRY, "memory leaked at non-absolute home #{message}")
+      10000.times do
+        begin
+          File.expand_path(#{arg}"~/a")
+        rescue ArgumentError => e
+          next
+        ensure
+          abort("ArgumentError (non-absolute home) expected") unless e
+        end
+      end
+      GC.start
+      TRY
+    end
+  end
+
+
   def test_expand_path_remove_trailing_alternative_data
     assert_equal File.join(@rootdir, "aaa"), File.expand_path("#{@rootdir}/aaa::$DATA")
     assert_equal File.join(@rootdir, "aa:a"), File.expand_path("#{@rootdir}/aa:a:$DATA")

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