mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fixup! fix: env var leak in tr_spawn_async() (#2212) (#2289) 

fix: fmr error with temporary strings
This commit is contained in:
Charles Kerr 2021-12-09 12:39:06 -06:00 committed by GitHub
parent eeb82b2fd3
commit b9de5bb9ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libtransmission/torrent.cc
View File

@ -1853,15 +1853,19 @@ static void torrentCallScript(tr_torrent const* tor, char const* script)
nullptr,
};
auto const id_str = std::to_string(tr_torrentId(tor));
auto const labels_str = buildLabelsString(tor);
auto const trackers_str = buildTrackersString(tor);
auto const env = std::map<std::string_view, std::string_view>{
{ "TR_APP_VERSION"sv, SHORT_VERSION_STRING },
{ "TR_TIME_LOCALTIME"sv, ctime_str },
{ "TR_TORRENT_DIR"sv, torrent_dir },
{ "TR_TORRENT_HASH"sv, tor->info.hashString },
{ "TR_TORRENT_ID"sv, std::to_string(tr_torrentId(tor)) },
{ "TR_TORRENT_LABELS"sv, buildLabelsString(tor) },
{ "TR_TORRENT_ID"sv, id_str },
{ "TR_TORRENT_LABELS"sv, labels_str },
{ "TR_TORRENT_NAME"sv, tr_torrentName(tor) },
{ "TR_TORRENT_TRACKERS"sv, buildTrackersString(tor) },
{ "TR_TORRENT_TRACKERS"sv, trackers_str },
};
tr_logAddTorInfo(tor, "Calling script \"%s\"", script);