Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-04-26 03:40:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: env var leak in tr_spawn_async() (#2212)

Browse Source 
* fix: env var leak in tr_spawn_async()
This commit is contained in:
Charles Kerr
2021-11-24 13:25:23 -06:00
committed by GitHub
parent d4e0f368c8
commit dbd9130d9d
5 changed files with 90 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libtransmission/subprocess-win32.cc
View File

@@ -20,6 +20,8 @@
#include "tr-assert.h"
#include "utils.h"
using namespace std::literals;
enum tr_app_type
{
TR_APP_TYPE_EXE,
@@ -128,28 +130,19 @@ static int compare_env_part_names(void const* vlhs, void const* vrhs)
return ret;
}
static wchar_t** to_wide_env(char const* const* env)
static wchar_t** to_wide_env(std::map<std::string_view, std::string_view> const& env)
{
if (env == nullptr || env[0] == nullptr)
auto const part_count = std::size(env);
wchar_t** const wide_env = tr_new(wchar_t*, part_count + 1);
int i = 0;
for (auto const& [key_sv, val_sv] : env)
{
return nullptr;
auto const line = tr_strvJoin(key_sv, "="sv, val_sv);
wide_env[i++] = tr_win32_utf8_to_native(std::data(line), std::size(line));
}
size_t part_count = 0;
while (env[part_count] != nullptr)
{
++part_count;
}
wchar_t** wide_env = tr_new(wchar_t*, part_count + 1);
for (size_t i = 0; i < part_count; ++i)
{
wide_env[i] = tr_win32_utf8_to_native(env[i], -1);
}
wide_env[part_count] = nullptr;
wide_env[i] = nullptr;
TR_ASSERT(i == part_count);
/* "The sort is case-insensitive, Unicode order, without regard to locale" (c) MSDN */
qsort(wide_env, part_count, sizeof(wchar_t*), &compare_env_part_names);
@@ -157,7 +150,7 @@ static wchar_t** to_wide_env(char const* const* env)
return wide_env;
}
static bool create_env_block(char const* const* env, wchar_t** env_block, tr_error** error)
static bool create_env_block(std::map<std::string_view, std::string_view> const& env, wchar_t** env_block, tr_error** error)
{
wchar_t** wide_env = to_wide_env(env);
@@ -379,7 +372,11 @@ cleanup:
return ret;
}
bool tr_spawn_async(char* const* cmd, char* const* env, char const* work_dir, tr_error** error)
bool tr_spawn_async(
char const* const* cmd,
std::map<std::string_view, std::string_view> const& env,
char const* work_dir,
tr_error** error)
{
wchar_t* env_block = nullptr;