sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-20 14:03:59 +03:00
Code

ctdb-daemon: Fix CID 1125627 Resource leak (RESOURCE_LEAK)

Browse Source 
Also fixes CID 1125628.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 940272d215049f5f5079aa926e69eae1985a4bfa)
This commit is contained in:
Martin Schwenke 2016-08-05 16:50:58 +10:00 committed by Karolin Seeger
parent 09cbfa6c9c
commit 15bcc4a1f0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ctdb/server/ctdb_logging.c
View File

@ -269,9 +269,14 @@ int ctdb_set_child_logging(struct ctdb_context *ctdb)
/* We'll fail if stderr/stdout not already open; it's simpler. */
old_stdout = dup(STDOUT_FILENO);
if (old_stdout < 0) {
DEBUG(DEBUG_ERR, ("Failed to dup stdout for child logging\n"));
return -1;
}
old_stderr = dup(STDERR_FILENO);
if (old_stdout < 0 || old_stderr < 0) {
DEBUG(DEBUG_ERR, ("Failed to dup stdout/stderr for child logging\n"));
if (old_stderr < 0) {
DEBUG(DEBUG_ERR, ("Failed to dup stderr for child logging\n"));
close(old_stdout);
return -1;
}
if (dup2(p[1], STDOUT_FILENO) < 0 || dup2(p[1], STDERR_FILENO) < 0) {