[前][次][番号順一覧][スレッド一覧]

ruby-changes:12391

From: usa <ko1@a...>
Date: Mon, 13 Jul 2009 22:33:19 +0900 (JST)
Subject: [ruby-changes:12391] Ruby:r24090 (trunk): * io.c (pipe_open): handles leaked on win32 when an error occurs.

usa	2009-07-13 22:33:00 +0900 (Mon, 13 Jul 2009)

  New Revision: 24090

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

  Log:
    * io.c (pipe_open): handles leaked on win32 when an error occurs.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24089)
+++ ChangeLog	(revision 24090)
@@ -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.
+
 Mon Jul 13 20:21:51 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* marshal.c (r_object0): should not shadow outer variable not to
Index: io.c
===================================================================
--- io.c	(revision 24089)
+++ io.c	(revision 24090)
@@ -5034,9 +5034,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;
 	}
     }

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

[前][次][番号順一覧][スレッド一覧]