Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibC: Don't leak FILEs on failed shebang exec

Browse Source
This commit is contained in:
Bananymous
2026-05-05 13:52:52 +03:00
parent ba106f6bf5
commit 4b12770485
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
userspace/libraries/LibC/unistd.cpp
View File

@@ -1,5 +1,6 @@
#include <BAN/Assert.h> #include <BAN/Assert.h>
#include <BAN/Debug.h> #include <BAN/Debug.h>
#include <BAN/ScopeGuard.h>
#include <BAN/StringView.h> #include <BAN/StringView.h>
#include <LibELF/AuxiliaryVector.h> #include <LibELF/AuxiliaryVector.h>
@@ -436,18 +437,20 @@ static int exec_impl(const char* pathname, char* const* argv, char* const* envp,
static int exec_impl_shebang(FILE* fp, const char* pathname, char* const* argv, char* const* envp, int shebang_depth) static int exec_impl_shebang(FILE* fp, const char* pathname, char* const* argv, char* const* envp, int shebang_depth)
{ {
constexpr size_t buffer_len = PATH_MAX + 1 + ARG_MAX + 1; constexpr size_t buffer_len = PATH_MAX + 1 + ARG_MAX + 1;
char* buffer = static_cast<char*>(malloc(buffer_len)); char* buffer = static_cast<char*>(malloc(buffer_len));
if (buffer == nullptr) if (buffer == nullptr)
{ {
fclose(fp); fclose(fp);
return -1; return -1;
} }
BAN::ScopeGuard _1([buffer] { free(buffer); });
if (fgets(buffer, buffer_len, fp) == nullptr) buffer = fgets(buffer, buffer_len, fp);
{ fclose(fp);
free(buffer);
if (buffer == nullptr)
return -1; return -1;
}
const auto sv_trim_whitespace = const auto sv_trim_whitespace =
[](BAN::StringView sv) -> BAN::StringView [](BAN::StringView sv) -> BAN::StringView
@@ -462,7 +465,6 @@ static int exec_impl_shebang(FILE* fp, const char* pathname, char* const* argv,
BAN::StringView buffer_sv = buffer; BAN::StringView buffer_sv = buffer;
if (buffer_sv.back() != '\n') if (buffer_sv.back() != '\n')
{ {
free(buffer);
errno = ENOEXEC; errno = ENOEXEC;
return -1; return -1;
} }
@@ -479,7 +481,6 @@ static int exec_impl_shebang(FILE* fp, const char* pathname, char* const* argv,
if (interpreter.empty()) if (interpreter.empty())
{ {
free(buffer);
errno = ENOEXEC; errno = ENOEXEC;
return -1; return -1;
} }
@@ -496,10 +497,8 @@ static int exec_impl_shebang(FILE* fp, const char* pathname, char* const* argv,
const size_t extra_args = 1 + !argument.empty(); const size_t extra_args = 1 + !argument.empty();
char** new_argv = static_cast<char**>(malloc((extra_args + old_argc + 1) * sizeof(char*)));; char** new_argv = static_cast<char**>(malloc((extra_args + old_argc + 1) * sizeof(char*)));;
if (new_argv == nullptr) if (new_argv == nullptr)
{
free(buffer);
return -1; return -1;
} BAN::ScopeGuard _2([new_argv] { free(new_argv); });
new_argv[0] = const_cast<char*>(pathname); new_argv[0] = const_cast<char*>(pathname);
if (!argument.empty()) if (!argument.empty())
@@ -510,10 +509,7 @@ static int exec_impl_shebang(FILE* fp, const char* pathname, char* const* argv,
new_argv[extra_args + i] = argv[i]; new_argv[extra_args + i] = argv[i];
new_argv[extra_args + old_argc] = nullptr; new_argv[extra_args + old_argc] = nullptr;
exec_impl(interpreter.data(), new_argv, envp, true, shebang_depth + 1); return exec_impl(interpreter.data(), new_argv, envp, true, shebang_depth + 1);
free(new_argv);
free(buffer);
return -1;
} }
static int execl_impl(const char* pathname, const char* arg0, va_list ap, bool has_env, bool do_path_resolution) static int execl_impl(const char* pathname, const char* arg0, va_list ap, bool has_env, bool do_path_resolution)