mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 22:31:06 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mworker: Do not attempt to close(2) fd -1

Browse Source 
Valgrind reports:

==3389== Warning: invalid file descriptor -1 in syscall close()

Check for >= 0 before closing.

This bug was introduced in commit ce83b4a5dd48c000dec68f9d551945d21e9ac7ac
and is specific to 1.9. No backport needed.
This commit is contained in:
Tim Duesterhus 2018-11-25 20:03:39 +01:00 committed by Willy Tarreau
parent da95fd901b
commit 742e0f9f1f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/haproxy.c
View File

@ -3099,7 +3099,8 @@ int main(int argc, char **argv)
* workers, we don't need to close the worker
* side of other workers since it's done with
* the bind_proc */
close(child->ipc_fd[0]);
if (child->ipc_fd[0] >= 0)
close(child->ipc_fd[0]);
if (child->relative_pid == relative_pid &&
child->reloads == 0) {
/* keep this struct if this is our pid */