Skip to content

Subprocess.h: use vector instead of dynamically-sized VLA #2529

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

Merged
quentin merged 2 commits into from
Feb 11, 2025
Merged

Subprocess.h: use vector instead of dynamically-sized VLA #2529

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb4d06
Subprocess.h: use vector instead of dynamically-sized VLA
katrinafyi Feb 10, 2025
add36f0
apply clang-format
katrinafyi Feb 11, 2025
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
11 changes: 5 additions & 6 deletions src/include/souffle/utility/SubProcess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ std::optional<detail::LinuxWaitStatus> execute(
if (::setenv(k, v, 1)) detail::perrorExit("setenv");
}

char* argv_temp[argv.size() + 2];
std::vector<char*> argv_temp(argv.size() + 2);
argv_temp[0] = const_cast<char*>(program.c_str());
std::copy_n(argv.data(), argv.size(), const_cast<char const**>(argv_temp) + 1);
std::copy_n(argv.data(), argv.size(), const_cast<char const**>(argv_temp.data()) + 1);
argv_temp[argv.size() + 1] = nullptr;

::execvp(program.c_str(), argv_temp);
::execvp(program.c_str(), argv_temp.data());
std::exit(EC::cannot_execute);
}

Expand Down Expand Up @@ -195,9 +195,8 @@ std::optional<detail::LinuxWaitStatus> execute(
std::unique_ptr<std::pair<char const*, char const*>[]> envp_temp =
std::make_unique<std::pair<char const*, char const*>[]>(envp.size());
auto argv_ptr = go(argv_temp.get(), argv, [](auto&& x) { return x.c_str(); });
auto envp_ptr = go(envp_temp.get(), envp, [](auto&& kv) {
return std::pair{kv.first, kv.second.c_str()};
});
auto envp_ptr =
go(envp_temp.get(), envp, [](auto&& kv) { return std::pair{kv.first, kv.second.c_str()}; });
return souffle::execute(program, argv_ptr, envp_ptr);
}

Expand Down
Loading