Skip to content

fix: 无参数启动时可能把空指针传给 execvp #1704

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

Open
enkilee wants to merge 3 commits into
base: master
Choose a base branch
from
+10 −4
Open

fix: 无参数启动时可能把空指针传给 execvp #1704

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a34a602
Signed-off-by: enkilee <jeffrey0122@163.com>
enkilee Jun 26, 2026
e854d7e
Signed-off-by: enkilee <jeffrey0122@163.com>
enkilee Jun 26, 2026
c0a28ab
Signed-off-by: enkilee <jeffrey0122@163.com>
enkilee Jun 26, 2026
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: 10 additions & 3 deletions apps/ll-init/src/ll-init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ std::vector<const char *> parse_args(int argc, char *argv[]) noexcept
while (idx < argc) {
args.emplace_back(argv[idx++]);
}
args.emplace_back(nullptr);

return args;
}
Expand All @@ -259,7 +258,7 @@ void print_child_status(int status, const std::string &pid) noexcept
}
}

pid_t run(std::vector<const char *> args, const sigConf &conf) noexcept
pid_t run(const std::vector<const char *> &args, const sigConf &conf) noexcept
{
auto pid = ::fork();
if (pid == -1) {
Comment thread
enkilee marked this conversation as resolved.
Expand All @@ -284,7 +283,15 @@ pid_t run(std::vector<const char *> args, const sigConf &conf) noexcept
return -1;
}

::execvp(args[0], const_cast<char *const *>(args.data()));
// build a null-terminated array for execvp
std::vector<char *> c_args;
c_args.reserve(args.size() + 1);
for (const auto *arg : args) {
c_args.emplace_back(const_cast<char *>(arg));
}
c_args.emplace_back(nullptr);

::execvp(c_args[0], c_args.data());
Comment thread
enkilee marked this conversation as resolved.
Outdated
print_sys_error("Failed to run process");
::_exit(EXIT_FAILURE);
}
Expand Down
Loading