Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not implicitly pass .fish files to /bin/sh

Browse source 
This expands the heuristic introduced in #7802 to prevent implicitly
passing files ending in .fish to /bin/sh.
This commit is contained in:
ridiculousfish 2021-03-27 19:17:18 -07:00
parent eb71e4555f
commit 694e112a9b
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/exec.cpp
View file

@ -92,6 +92,12 @@ static bool is_thompson_shell_payload(const char *p, size_t n) {
/// such as Actually Portable Executable.
/// N.B.: this is called after fork, it must not allocate heap memory.
bool is_thompson_shell_script(const char *path) {
// Paths ending in ".fish" are never considered Thompson shell scripts.
if (const char *lastdot = strrchr(path, '.')) {
if (0 == strcmp(lastdot, ".fish")) {
return false;
}
}
int e = errno;
bool res = false;
int fd = open_cloexec(path, O_RDONLY | O_NOCTTY);

21
tests/checks/noshebang.fish
View file

@ -32,6 +32,27 @@ runfile
#CHECK: 0
#CHECK: 0
# Never implicitly pass files ending with .fish to /bin/sh.
true >file.fish
chmod a+x file.fish
set -g fish_use_posix_spawn 0
./file.fish
echo $status
set -g fish_use_posix_spawn 1
./file.fish
echo $status
rm file.fish
#CHECK: 125
#CHECKERR: Failed {{.*}}
#CHECKERR: exec: {{.*}}
#CHECKERR: {{.*}}
#CHECK: 125
#CHECKERR: Failed {{.*}}
#CHECKERR: exec: {{.*}}
#CHECKERR: {{.*}}
# On to NUL bytes.
# The heuristic is that there must be a line containing a lowercase letter before the first NUL byte.
echo -n -e 'true\n\x00' >file