summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2014-10-08 23:57:32 +0200
committerThomas Hindoe Paaboel Andersen <phomes@gmail.com>2014-10-09 00:19:57 +0200
commit6f53e671aa7539cab02c9f739d84d28a343ca5bc (patch)
tree9a415a8eb71bb30c7b69d29d7905712b5bff6d47
parent5ab99e076c72a44f2e174e48abd9945cd0180d76 (diff)
util: avoid double close of fd
We could end with a double close if we close the fd loop and flush_fd fails. That would make us goto fail and there we close the fd once again. This patch sets the fd to the return value for safe_close: -1 A fd with negative value will be ignored by the next call to safe_close. CID#996223
-rw-r--r--src/shared/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/util.c b/src/shared/util.c
index bbd9bd11d6..5f6249eb04 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2074,7 +2074,7 @@ int acquire_terminal(
* ended our handle will be dead. It's important that
* we do this after sleeping, so that we don't enter
* an endless loop. */
- safe_close(fd);
+ fd = safe_close(fd);
}
safe_close(notify);