TS-898: avoid passing -1 to close (2) in traffic_cop This is harmless, but also trivial to fix. Coverity #1021900.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f4aa7b22 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f4aa7b22 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f4aa7b22 Branch: refs/heads/5.0.x Commit: f4aa7b22055f9eea4b524fcb5462915e792d627c Parents: c945682 Author: James Peach <[email protected]> Authored: Sat Apr 12 12:30:25 2014 -0700 Committer: James Peach <[email protected]> Committed: Sat Apr 12 12:36:27 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ cmd/traffic_cop/traffic_cop.cc | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f4aa7b22/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8c6e195..4970f8e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-898] Avoid passing -1 to close (2) in traffic_cop. + *) [TS-898] Fix minor regex_remap parsing bug. *) [TS-2711] Include Lua JIT as a Submodule. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f4aa7b22/cmd/traffic_cop/traffic_cop.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc index ee80716..50615f2 100644 --- a/cmd/traffic_cop/traffic_cop.cc +++ b/cmd/traffic_cop/traffic_cop.cc @@ -737,7 +737,9 @@ spawn_manager() } else if (err == -1) { cop_log(COP_FATAL, "unable to fork [%d '%s']\n", errno, strerror(errno)); exit(1); - } else { + } + + if (log_fd >= 0) { close(log_fd); }
