walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Shut up scan-build

This commit is contained in:
Tatsuhiro Tsujikawa 2014-10-30 22:36:22 +09:00
parent 20900b133e
commit be1a513c59
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shrpx.cc
View File

@ -381,8 +381,7 @@ void exec_binary_signal_cb(evutil_socket_t sig, short events, void *arg)
return; return;
} }
auto argv = auto argv = util::make_unique<char*[]>(get_config()->argc + 1);
static_cast<char**>(malloc(sizeof(char*) * (get_config()->argc + 1)));
argv[0] = exec_path; argv[0] = exec_path;
for(int i = 1; i < get_config()->argc; ++i) { for(int i = 1; i < get_config()->argc; ++i) {
@ -393,7 +392,7 @@ void exec_binary_signal_cb(evutil_socket_t sig, short events, void *arg)
size_t envlen = 0; size_t envlen = 0;
for(char **p = environ; *p; ++p, ++envlen); for(char **p = environ; *p; ++p, ++envlen);
// 3 for missing fd4, fd6 and port. // 3 for missing fd4, fd6 and port.
auto envp = static_cast<char**>(malloc(sizeof(char*) * (envlen + 3 + 1))); auto envp = util::make_unique<char*[]>(envlen + 3 + 1);
size_t envidx = 0; size_t envidx = 0;
auto evlistener4 = listener_handler->get_evlistener4(); auto evlistener4 = listener_handler->get_evlistener4();
@ -437,7 +436,7 @@ void exec_binary_signal_cb(evutil_socket_t sig, short events, void *arg)
} }
} }
if(execve(argv[0], argv, envp) == -1) { if(execve(argv[0], argv.get(), envp.get()) == -1) {
auto error = errno; auto error = errno;
LOG(ERROR) << "execve failed: errno=" << error; LOG(ERROR) << "execve failed: errno=" << error;
_Exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);