Skip to content

TS-4003 CID 1338381 & 1022062: in traffic_cop #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
danobi wants to merge 1 commit into from
Closed

TS-4003 CID 1338381 & 1022062: in traffic_cop #329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions cmd/traffic_cop/traffic_cop.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,15 +747,16 @@ spawn_manager()
char old_log_file[PATH_NAME_MAX];
snprintf(old_log_file, sizeof(old_log_file), "%s.old", log_file);
// coverity[toctou]
rename(log_file, old_log_file);
cop_log(COP_WARNING, "rename %s to %s as it is not accessible.\n", log_file, old_log_file);
if (rename(log_file, old_log_file) != 0)
cop_log(COP_WARNING, "unable to rename() \"%s\" to \"%s\" [%d '%s']\n", log_file, old_log_file, errno, strerror(errno));
else
cop_log(COP_WARNING, "rename %s to %s as it is not accessible.\n", log_file, old_log_file);
}

// Bind stdout and stderr of traffic_manager to traffic.out
int max_opts_len = OPTIONS_LEN_MAX - strlen(manager_options);
char tm_opt_buf[max_opts_len];
int cx = snprintf(tm_opt_buf, max_opts_len, " --%s %s --%s %s", TM_OPT_BIND_STDOUT, log_file, TM_OPT_BIND_STDERR, log_file);
if (cx >= 0 && cx < max_opts_len)
char tm_opt_buf[OPTIONS_LEN_MAX];
int cx = snprintf(tm_opt_buf, OPTIONS_LEN_MAX, " --%s %s --%s %s", TM_OPT_BIND_STDOUT, log_file, TM_OPT_BIND_STDERR, log_file);
if (cx >= 0 && cx < OPTIONS_LEN_MAX && (strlen(manager_options) + strlen(tm_opt_buf) < OPTIONS_LEN_MAX))
strcat(manager_options, tm_opt_buf);
else
cop_log(COP_WARNING, "bind_stdout and bind_stderr flags are too long, not binding anything\n");
Expand Down