admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix descriptor leakage.

Browse Source
This commit is contained in:
Tomoyuki Sahara
2013-09-30 10:36:29 +09:00
parent b4f0a68fba
commit d75d23294d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/io.c
+9 -5
View File
@@ -195,7 +195,8 @@ mrb_io_s_popen(mrb_state *mrb, mrb_value klass)
struct mrb_io *fptr;
const char *pname;
int pid, flags, fd, write_fd = -1;
int pr[2], pw[2];
int pr[2] = { -1, -1 };
int pw[2] = { -1, -1 };
int doexec;
mrb_get_args(mrb, "S|SH", &cmd, &mode, &opt);
@@ -206,10 +207,13 @@ mrb_io_s_popen(mrb_state *mrb, mrb_value klass)
doexec = (strcmp("-", pname) != 0);
if (((flags & FMODE_READABLE) && pipe(pr) == -1)
|| ((flags & FMODE_WRITABLE) && pipe(pw) == -1)) {
mrb_sys_fail(mrb, "pipe_open failed.");
return mrb_nil_value();
if ((flags & FMODE_READABLE) && pipe(pr) == -1) {
mrb_sys_fail(mrb, "pipe");
}
if ((flags & FMODE_WRITABLE) && pipe(pw) == -1) {
if (pr[0] != -1) close(pr[0]);
if (pr[1] != -1) close(pr[1]);
mrb_sys_fail(mrb, "pipe");
}
if (!doexec) {