Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: avoid tr_malloc / tr_free in subprocess-win32 (#3648)

Browse Source
This commit is contained in:
Charles Kerr
2022-08-16 00:07:06 -05:00
committed by GitHub
parent c625ec7e0f
commit 99c21efecc
1 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libtransmission/subprocess-win32.cc
View File

@@ -10,6 +10,7 @@
#include <cwchar> #include <cwchar>
#include <map> #include <map>
#include <iterator> #include <iterator>
#include <string>
#include <string_view> #include <string_view>
#include <fmt/format.h> #include <fmt/format.h>
@@ -141,27 +142,20 @@ auto get_current_env()
return env; return env;
} }
void append_argument(char** arguments, char const* argument) void append_argument(std::string& arguments, char const* argument)
{ {
size_t arguments_len = *arguments != nullptr ? strlen(*arguments) : 0u; if (!std::empty(arguments))
size_t const argument_len = strlen(argument);
if (arguments_len > 0)
{ {
(*arguments)[arguments_len++] = ' '; arguments += ' ';
} }
if (!tr_str_is_empty(argument) && strpbrk(argument, " \t\n\v\"") == nullptr) if (!tr_str_is_empty(argument) && strpbrk(argument, " \t\n\v\"") == nullptr)
{ {
*arguments = tr_renew(char, *arguments, arguments_len + argument_len + 2); arguments += argument;
strcpy(*arguments + arguments_len, argument);
return; return;
} }
*arguments = tr_renew(char, *arguments, arguments_len + argument_len * 2 + 4); arguments += '"';
char* dst = *arguments + arguments_len;
*(dst++) = '"';
for (char const* src = argument; *src != '\0';) for (char const* src = argument; *src != '\0';)
{ {
@@ -186,18 +180,16 @@ void append_argument(char** arguments, char const* argument)
if (backslash_count != 0) if (backslash_count != 0)
{ {
memset(dst, '\\', backslash_count); arguments.append(backslash_count, '\\');
dst += backslash_count;
} }
if (*src != '\0') if (*src != '\0')
{ {
*(dst++) = *(src++); arguments += *src++;
} }
} }
*(dst++) = '"'; arguments += '"';
*(dst++) = '\0';
} }
bool contains_batch_metachars(char const* text) bool contains_batch_metachars(char const* text)
@@ -223,7 +215,7 @@ auto get_app_type(char const* app)
return tr_app_type::EXE; return tr_app_type::EXE;
} }
void append_app_launcher_arguments(tr_app_type app_type, char** args) void append_app_launcher_arguments(tr_app_type app_type, std::string& args)
{ {
switch (app_type) switch (app_type)
{ {
@@ -249,28 +241,25 @@ std::wstring construct_cmd_line(char const* const* cmd)
{ {
auto const app_type = get_app_type(cmd[0]); auto const app_type = get_app_type(cmd[0]);
char* args = nullptr; auto args = std::string{};
append_app_launcher_arguments(app_type, &args); append_app_launcher_arguments(app_type, args);
for (size_t i = 0; cmd[i] != nullptr; ++i) for (size_t i = 0; cmd[i] != nullptr; ++i)
{ {
if (app_type == tr_app_type::BATCH && i > 0 && contains_batch_metachars(cmd[i])) if (app_type == tr_app_type::BATCH && i > 0 && contains_batch_metachars(cmd[i]))
{ {
/* FIXME: My attempts to escape them one or another way didn't lead to anything good so far */ /* FIXME: My attempts to escape them one or another way didn't lead to anything good so far */
tr_free(args); args.clear();
args = nullptr;
break; break;
} }
append_argument(&args, cmd[i]); append_argument(args, cmd[i]);
} }
if (args != nullptr) if (!std::empty(args))
{ {
auto cmd_line = tr_win32_utf8_to_native(args); return tr_win32_utf8_to_native(args);
tr_free(args);
return cmd_line;
} }
return {}; return {};