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

fixup! add labels to torrent-add rpc method (#2539) (#2589) 

fix potential memory leak reported by coverity
This commit is contained in:
Charles Kerr 2022-02-08 19:04:29 -06:00 committed by GitHub
parent 2bf25fbdf5
commit a92af9193e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libtransmission/rpcimpl.cc
View File

@ -10,6 +10,7 @@
#include <iterator>
#include <numeric>
#include <string_view>
#include <utility>
#include <vector>
#include <libdeflate.h>
@ -933,8 +934,9 @@ static char const* torrentGet(tr_session* session, tr_variant* args_in, tr_varia
****
***/
static char const* makeLabels(tr_labels_t* labels, tr_variant* list)
static std::pair<tr_labels_t, char const* /*errmsg*/> makeLabels(tr_variant* list)
{
auto labels = tr_labels_t{};
size_t const n = tr_variantListSize(list);
for (size_t i = 0; i < n; ++i)
{
@ -947,31 +949,30 @@ static char const* makeLabels(tr_labels_t* labels, tr_variant* list)
label = tr_strvStrip(label);
if (std::empty(label))
{
return "labels cannot be empty";
return { {}, "labels cannot be empty" };
}
if (tr_strvContains(label, ','))
{
return "labels cannot contain comma (,) character";
return { {}, "labels cannot contain comma (,) character" };
}
labels->emplace(label);
labels.emplace(label);
}
return nullptr;
return { labels, nullptr };
}
static char const* setLabels(tr_torrent* tor, tr_variant* list)
{
auto labels = tr_labels_t{};
auto [labels, errmsg] = makeLabels(list);
if (auto const* errmsg = makeLabels(&labels, list); errmsg != nullptr)
if (errmsg != nullptr)
{
return errmsg;
}
tr_torrentSetLabels(tor, std::move(labels));
return nullptr;
}
@ -1660,9 +1661,11 @@ static char const* torrentAdd(tr_session* session, tr_variant* args_in, tr_varia
if (tr_variantDictFindList(args_in, TR_KEY_labels, &l))
{
auto labels = tr_labels_t{};
if (auto const* errmsg = makeLabels(&labels, l); errmsg != nullptr)
auto [labels, errmsg] = makeLabels(l);
if (errmsg != nullptr)
{
tr_ctorFree(ctor);
return errmsg;
}