diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 13:33:00 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 13:33:00 +0000 |
commit | 0fefd1902329f72434e859bd77a7ea5a114c00ff (patch) | |
tree | e11848d24f12c7e9043d2b6d2afcb2c511a98d4b | |
parent | 76e30054317d1f56137e6ae46e494b1c43f4a85e (diff) | |
download | ruby-0fefd1902329f72434e859bd77a7ea5a114c00ff.tar.gz |
* io.c (pipe_open): handles leaked on win32 when an error occurs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io.c | 16 |
2 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon Jul 13 22:28:03 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * io.c (pipe_open): handles leaked on win32 when an error occurs. + Mon Jul 13 20:21:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * marshal.c (r_object0): should not shadow outer variable not to @@ -5034,9 +5034,19 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode, 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; } } |