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

ruby-changes:15163

From: nobu <ko1@a...>
Date: Thu, 25 Mar 2010 14:50:31 +0900 (JST)
Subject: [ruby-changes:15163] Ruby:r27042 (trunk): * win32/win32.c (rb_w32_{read,write}): fix handle leaks. based on

nobu	2010-03-25 14:50:08 +0900 (Thu, 25 Mar 2010)

  New Revision: 27042

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

  Log:
    * win32/win32.c (rb_w32_{read,write}): fix handle leaks.  based on
      a patch from Heesob Park in [ruby-core:28919].  [ruby-core:28833]

  Modified files:
    trunk/ChangeLog
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27041)
+++ ChangeLog	(revision 27042)
@@ -1,3 +1,8 @@
+Thu Mar 25 14:50:00 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/win32.c (rb_w32_{read,write}): fix handle leaks.  based on
+	  a patch from Heesob Park in [ruby-core:28919].  [ruby-core:28833]
+
 Thu Mar 25 12:37:37 2010  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* NEWS: add Kernel#singleton_class.
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 27041)
+++ win32/win32.c	(revision 27042)
@@ -4895,6 +4895,7 @@
     if (!ReadFile((HANDLE)_osfhnd(fd), buf, len, &read, pol)) {
 	err = GetLastError();
 	if (err != ERROR_IO_PENDING) {
+	    if (pol) CloseHandle(ol.hEvent);
 	    if (err == ERROR_ACCESS_DENIED)
 		errno = EBADF;
 	    else if (err == ERROR_BROKEN_PIPE || err == ERROR_HANDLE_EOF) {
@@ -5028,6 +5029,7 @@
     if (!WriteFile((HANDLE)_osfhnd(fd), buf, len, &written, pol)) {
 	err = GetLastError();
 	if (err != ERROR_IO_PENDING) {
+	    if (pol) CloseHandle(ol.hEvent);
 	    if (err == ERROR_ACCESS_DENIED)
 		errno = EBADF;
 	    else

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

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