yugui	2009-07-15 20:57:55 +0900 (Wed, 15 Jul 2009)

  New Revision: 24120

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

  Log:
    merges r24090 from trunk into ruby_1_9_1.
    --
    * io.c (pipe_open): handles leaked on win32 when an error occurs.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/io.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24119)
+++ ruby_1_9_1/ChangeLog	(revision 24120)
@@ -1,3 +1,7 @@
+Mon Jul 13 22:28:03 2009  NAKAMURA Usaku  <usa@r...>
+
+	* io.c (pipe_open): handles leaked on win32 when an error occurs.
+
 Tue Jul 14 01:24:56 2009  NARUSE, Yui  <naruse@r...>
 
 	* marshal.c (r_object0): should return real object.
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 24119)
+++ ruby_1_9_1/io.c	(revision 24120)
@@ -4650,9 +4650,19 @@
 	    rb_thread_sleep(1);
 	    break;
 	  default:
-	    if (eargp)
-		rb_run_exec_options(&sarg, NULL);
-	    rb_sys_fail(cmd);
+	    {
+		int e = errno;
+		if (eargp)
+		    rb_run_exec_options(&sarg, NULL);
+		close(pair[0]);
+		close(pair[1]);
+		if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
+		    close(write_pair[0]);
+		    close(write_pair[1]);
+		}
+		errno = e;
+		rb_sys_fail(cmd);
+	    }
 	    break;
 	}
     }
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24119)
+++ ruby_1_9_1/version.h	(revision 24120)
@@ -4,7 +4,7 @@
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-#define RUBY_PATCHLEVEL 233
+#define RUBY_PATCHLEVEL 234
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
 #define RUBY_RELEASE_DAY 12

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