tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix execvp/execvpe behavior with absolute paths and ENOEXEC."

Browse source
This commit is contained in:
Elliott Hughes 2016-08-26 16:14:52 +00:00 committed by Gerrit Code Review
commit 6395a3047a
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libc/bionic/exec.cpp
View file

@ -115,7 +115,8 @@ int execvpe(const char* name, char* const* argv, char* const* envp) {
// If it's an absolute or relative path name, it's easy. // If it's an absolute or relative path name, it's easy.
if (strchr(name, '/') && execve(name, argv, envp) == -1) { if (strchr(name, '/') && execve(name, argv, envp) == -1) {
return __exec_as_script(name, argv, envp); if (errno == ENOEXEC) return __exec_as_script(name, argv, envp);
return -1;
} }
// Get the path we're searching. // Get the path we're searching.

9
tests/unistd_test.cpp
View file

@ -1272,3 +1272,12 @@ TEST(UNISTD_TEST, execvpe_ENOEXEC) {
// implementation. // implementation.
eth.Run([&]() { execvpe(tf.filename, eth.GetArgs(), eth.GetEnv()); }, 0, "script\n"); eth.Run([&]() { execvpe(tf.filename, eth.GetArgs(), eth.GetEnv()); }, 0, "script\n");
} }
TEST(UNISTD_TEST, execvp_libcore_test_55017) {
ExecTestHelper eth;
eth.SetArgs({"/system/bin/does-not-exist", nullptr});
errno = 0;
ASSERT_EQ(-1, execvp("/system/bin/does-not-exist", eth.GetArgs()));
ASSERT_EQ(ENOENT, errno);
}