From f2a46c3d00d9a11bac60680c82cd27a9c161e58a Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Tue, 15 Jan 2013 18:52:59 +0400 Subject: [PATCH] util: check that stdin are unused before closing Signed-off-by: Andrey Vagin Signed-off-by: Pavel Emelyanov --- util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util.c b/util.c index 82220ff7b..93678d2d9 100644 --- a/util.c +++ b/util.c @@ -532,13 +532,13 @@ int cr_system(int in, int out, int err, char *cmd, char *const argv[]) if (out == in) out = DUP_SAFE(out, out_chld); + if (move_img_fd(&out, STDIN_FILENO) || + move_img_fd(&err, STDIN_FILENO)) + goto out_chld; + if (in < 0) { close(STDIN_FILENO); } else { - if (move_img_fd(&out, STDIN_FILENO) || - move_img_fd(&err, STDIN_FILENO)) - goto out_chld; - if (reopen_fd_as_nocheck(STDIN_FILENO, in)) goto out_chld; }