diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 11:57:55 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 11:57:55 +0000 |
commit | 5c6d11007b4a2b4333d8b836e64962e5d3a9a7a0 (patch) | |
tree | ee3c82962fb2288ea2f17c93d2440709cb1ff1f6 | |
parent | f4325595ca86a248897e5c03685656437e5b485f (diff) | |
download | ruby-5c6d11007b4a2b4333d8b836e64962e5d3a9a7a0.tar.gz ruby-5c6d11007b4a2b4333d8b836e64962e5d3a9a7a0.tar.xz ruby-5c6d11007b4a2b4333d8b836e64962e5d3a9a7a0.zip |
merges r24090 from trunk into ruby_1_9_1.
--
* io.c (pipe_open): handles leaked on win32 when an error occurs.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io.c | 16 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 18 insertions, 4 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. + Tue Jul 14 01:24:56 2009 NARUSE, Yui <naruse@ruby-lang.org> * marshal.c (r_object0): should return real object. @@ -4650,9 +4650,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; } } @@ -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 |