matz	2008-04-21 15:54:48 +0900 (Mon, 21 Apr 2008)

  New Revision: 16120

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/tempfile.rb

  Log:
    * lib/tempfile.rb (Tempfile::_close): check @data before modifying
      it backported from 1.9.  [ruby-dev:34094]
    
    * lib/tempfile.rb (Tempfile::close): clear @data and @tmpname.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16120&r2=16119&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/tempfile.rb?r1=16120&r2=16119&diff_format=u

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16119)
+++ ruby_1_8/ChangeLog	(revision 16120)
@@ -113,6 +113,13 @@
 	  test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9.
 	  [ruby-dev:31318]
 
+Wed Apr 16 14:22:42 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/tempfile.rb (Tempfile::_close): check @data before modifying
+	  it backported from 1.9.  [ruby-dev:34094]
+
+	* lib/tempfile.rb (Tempfile::close): clear @data and @tmpname.
+
 Wed Apr 16 06:03:45 2008  Akinori MUSHA  <knu@i...>
 
 	* test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_event):
Index: ruby_1_8/lib/tempfile.rb
===================================================================
--- ruby_1_8/lib/tempfile.rb	(revision 16119)
+++ ruby_1_8/lib/tempfile.rb	(revision 16120)
@@ -95,7 +95,8 @@
 
   def _close	# :nodoc:
     @tmpfile.close if @tmpfile
-    @data[1] = @tmpfile = nil
+    @tmpfile = nil
+    @data[1] = nil if @data
   end    
   protected :_close
 
@@ -117,6 +118,7 @@
     _close
     @clean_proc.call
     ObjectSpace.undefine_finalizer(self)
+    @data = @tmpname = nil
   end
 
   # Unlinks the file.  On UNIX-like systems, it is often a good idea

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