mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-06 15:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use modern unique_ptr practices

Browse Source
This commit is contained in:
sledgehammer999 2019-12-15 17:03:02 +02:00
parent a25ed5f639
commit 4ae8e176dc
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/application.cpp
View File

@ -332,22 +332,20 @@ void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) c
logger->addMessage(tr("Torrent: %1, running external program, command: %2").arg(torrent->name(), program)); logger->addMessage(tr("Torrent: %1, running external program, command: %2").arg(torrent->name(), program));
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
std::unique_ptr<wchar_t[]> programWchar(new wchar_t[program.length() + 1] {}); auto programWchar = std::make_unique<wchar_t[]>(program.length() + 1);
program.toWCharArray(programWchar.get()); program.toWCharArray(programWchar.get());
// Need to split arguments manually because QProcess::startDetached(QString) // Need to split arguments manually because QProcess::startDetached(QString)
// will strip off empty parameters. // will strip off empty parameters.
// E.g. `python.exe "1" "" "3"` will become `python.exe "1" "3"` // E.g. `python.exe "1" "" "3"` will become `python.exe "1" "3"`
int argCount = 0; int argCount = 0;
LPWSTR *args = ::CommandLineToArgvW(programWchar.get(), &argCount); std::unique_ptr<LPWSTR[], decltype(&::LocalFree)> args {::CommandLineToArgvW(programWchar.get(), &argCount), ::LocalFree};
QStringList argList; QStringList argList;
for (int i = 1; i < argCount; ++i) for (int i = 1; i < argCount; ++i)
argList += QString::fromWCharArray(args[i]); argList += QString::fromWCharArray(args[i]);
QProcess::startDetached(QString::fromWCharArray(args[0]), argList); QProcess::startDetached(QString::fromWCharArray(args[0]), argList);
::LocalFree(args);
#else #else
// Cannot give users shell environment by default, as doing so could // Cannot give users shell environment by default, as doing so could
// enable command injection via torrent name and other arguments // enable command injection via torrent name and other arguments