Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-06-20 23:54:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5192

Browse source 
d0e07b3d performance_tests: fix NetBSD build (moneromooo-monero)
7d88d8f2 discontinue use of alloca (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-03-17 17:56:52 +02:00
commit c3de019f56
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/common/spawn.cpp
View file

@ -91,7 +91,7 @@ int spawn(const char *filename, const std::vector<std::string>& args, bool wait)
MINFO("Child exited with " << exitCode);
return static_cast<int>(exitCode);
#else
char **argv = (char**)alloca(sizeof(char*) * (args.size() + 1));
std::vector<char*> argv(args.size() + 1);
for (size_t n = 0; n < args.size(); ++n)
argv[n] = (char*)args[n].c_str();
argv[args.size()] = NULL;
@ -109,7 +109,7 @@ int spawn(const char *filename, const std::vector<std::string>& args, bool wait)
tools::closefrom(3);
close(0);
char *envp[] = {NULL};
execve(filename, argv, envp);
execve(filename, argv.data(), envp);
MERROR("Failed to execve: " << strerror(errno));
return -1;
}