mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-23 08:13:27 +00:00
Code Issues Releases Wiki Activity

fix: silence unexpected key warnings in torrent file parser (#3133)

Browse source
This commit is contained in:
Charles Kerr 2022-05-24 15:28:02 -05:00 committed by GitHub
parent 1cae467acd
commit 26b1a9154e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libtransmission/open-files.cc
View file

@ -253,7 +253,7 @@ void tr_open_files::closeAll()
void tr_open_files::closeTorrent(tr_torrent_id_t tor_id)
{
return pool_.erase_if([&tor_id](Key const& key, Val const&) { return key.first == tor_id; });
return pool_.erase_if([&tor_id](Key const& key, Val const& /*unused*/) { return key.first == tor_id; });
}
void tr_open_files::closeFile(tr_torrent_id_t tor_id, tr_file_index_t file_num)

75
libtransmission/torrent-metainfo.cc
View file

@ -324,7 +324,7 @@ struct MetainfoHandler final : public transmission::benc::BasicHandler<MaxBencDe
unhandled = true;
}
}
else if (pathIs(CreationDateKey))
else if (pathIs(CreationDateKey) || pathIs(InfoKey, CreationDateKey))
{
tm_.date_created_ = value;
}
@ -346,10 +346,19 @@ struct MetainfoHandler final : public transmission::benc::BasicHandler<MaxBencDe
// TODO https://github.com/transmission/transmission/issues/458
}
else if (
pathIs(DurationKey) || pathIs(EncodedRateKey) || pathIs(HeightKey) || pathIs(InfoKey, EntropyKey) ||
pathIs(ProfilesKey, HeightKey) || pathIs(ProfilesKey, WidthKey) || pathIs(WidthKey) ||
pathStartsWith(AzureusPropertiesKey) || pathStartsWith(InfoKey, FileDurationKey) ||
pathStartsWith(InfoKey, FileMediaKey) || pathStartsWith(InfoKey, ProfilesKey))
pathIs(DurationKey) || //
pathIs(EncodedRateKey) || //
pathIs(HeightKey) || //
pathIs(InfoKey, EntropyKey) || //
pathIs(InfoKey, UniqueKey) || //
pathIs(ProfilesKey, HeightKey) || //
pathIs(ProfilesKey, WidthKey) || //
pathIs(WidthKey) || //
pathStartsWith(AzureusPropertiesKey) || //
pathStartsWith(InfoKey, FileDurationKey) || //
pathStartsWith(InfoKey, FileMediaKey) || //
pathStartsWith(InfoKey, ProfilesKey) || //
pathStartsWith(LibtorrentResumeKey))
{
// unused by Transmission
}
@ -403,6 +412,17 @@ struct MetainfoHandler final : public transmission::benc::BasicHandler<MaxBencDe
// currently unused. TODO support for bittorrent v2
// TODO https://github.com/transmission/transmission/issues/458
}
else if (
pathIs(InfoKey, FilesKey, ""sv, Crc32Key) || //
pathIs(InfoKey, FilesKey, ""sv, Ed2kKey) || //
pathIs(InfoKey, FilesKey, ""sv, Md5Key) || //
pathIs(InfoKey, FilesKey, ""sv, Md5sumKey) || //
pathIs(InfoKey, FilesKey, ""sv, MtimeKey) || // (why a string?)
pathIs(InfoKey, FilesKey, ""sv, Sha1Key) || //
pathStartsWith(InfoKey, FilesKey, ""sv, PathUtf8Key))
{
// unused by Transmission
}
else
{
unhandled = true;
@ -456,16 +476,34 @@ struct MetainfoHandler final : public transmission::benc::BasicHandler<MaxBencDe
{
tm_.announceList().add(value, tier_);
}
else if (
pathIs(ChecksumKey) || pathIs(InfoKey, FilesKey, ""sv, MtimeKey) || pathIs(InfoKey, PublisherUrlKey) ||
pathIs(PublisherUrlKey) || pathStartsWith(AzureusPropertiesKey) || pathStartsWith(InfoKey, ProfilesKey))
{
// unused by Transmission
}
else if (curdepth == 2 && (pathStartsWith(HttpSeedsKey) || pathStartsWith(UrlListKey)))
{
tm_.addWebseed(value);
}
else if (
pathIs(ChecksumKey) || //
pathIs(ErrCallbackKey) || //
pathIs(InfoKey, Ed2kKey) || //
pathIs(InfoKey, EntropyKey) || //
pathIs(InfoKey, Md5sumKey) || //
pathIs(InfoKey, PublisherUrlKey) || //
pathIs(InfoKey, Sha1Key) || //
pathIs(InfoKey, UniqueKey) || //
pathIs(InfoKey, XCrossSeedKey) || //
pathIs(LocaleKey) || //
pathIs(LogCallbackKey) || //
pathIs(PublisherUrlKey) || //
pathIs(TitleKey) || //
pathStartsWith(AzureusPrivatePropertiesKey) || //
pathStartsWith(AzureusPropertiesKey) || //
pathStartsWith(InfoKey, CollectionsKey) || //
pathStartsWith(InfoKey, FileDurationKey) || //
pathStartsWith(InfoKey, ProfilesKey) || //
pathStartsWith(LibtorrentResumeKey) || //
pathStartsWith(MagnetInfoKey))
{
// unused by Transmission
}
else
{
unhandled = true;
@ -595,17 +633,22 @@ private:
static constexpr std::string_view AnnounceKey = "announce"sv;
static constexpr std::string_view AnnounceListKey = "announce-list"sv;
static constexpr std::string_view AttrKey = "attr"sv;
static constexpr std::string_view AzureusPrivatePropertiesKey = "azureus_private_properties"sv;
static constexpr std::string_view AzureusPropertiesKey = "azureus_properties"sv;
static constexpr std::string_view ChecksumKey = "checksum"sv;
static constexpr std::string_view CollectionsKey = "collections"sv;
static constexpr std::string_view CommentKey = "comment"sv;
static constexpr std::string_view CommentUtf8Key = "comment.utf-8"sv;
static constexpr std::string_view Crc32Key = "crc32"sv;
static constexpr std::string_view CreatedByKey = "created by"sv;
static constexpr std::string_view CreatedByUtf8Key = "created by.utf-8"sv;
static constexpr std::string_view CreationDateKey = "creation date"sv;
static constexpr std::string_view DurationKey = "duration"sv;
static constexpr std::string_view Ed2kKey = "ed2k"sv;
static constexpr std::string_view EncodedRateKey = "encoded rate"sv;
static constexpr std::string_view EncodingKey = "encoding"sv;
static constexpr std::string_view EntropyKey = "entropy"sv;
static constexpr std::string_view ErrCallbackKey = "err_callback"sv;
static constexpr std::string_view FileDurationKey = "file-duration"sv;
static constexpr std::string_view FileMediaKey = "file-media"sv;
static constexpr std::string_view FileTreeKey = "file tree"sv;
@ -614,12 +657,18 @@ private:
static constexpr std::string_view HttpSeedsKey = "httpseeds"sv;
static constexpr std::string_view InfoKey = "info"sv;
static constexpr std::string_view LengthKey = "length"sv;
static constexpr std::string_view LibtorrentResumeKey = "libtorrent_resume"sv;
static constexpr std::string_view LocaleKey = "locale"sv;
static constexpr std::string_view LogCallbackKey = "log_callback"sv;
static constexpr std::string_view MagnetInfoKey = "magnet-info"sv;
static constexpr std::string_view Md5Key = "md5"sv;
static constexpr std::string_view Md5sumKey = "md5sum"sv;
static constexpr std::string_view MetaVersionKey = "meta version"sv;
static constexpr std::string_view MtimeKey = "mtime"sv;
static constexpr std::string_view NameKey = "name"sv;
static constexpr std::string_view NameUtf8Key = "name.utf-8"sv;
static constexpr std::string_view PathKey = "path"sv;
static constexpr std::string_view PathUtf8Key = "path.utf-8"sv;
static constexpr std::string_view PieceLayersKey = "piece layers"sv;
static constexpr std::string_view PieceLengthKey = "piece length"sv;
static constexpr std::string_view PiecesKey = "pieces"sv;
@ -628,10 +677,14 @@ private:
static constexpr std::string_view ProfilesKey = "profiles"sv;
static constexpr std::string_view PublisherKey = "publisher"sv;
static constexpr std::string_view PublisherUrlKey = "publisher-url"sv;
static constexpr std::string_view Sha1Key = "sha1"sv;
static constexpr std::string_view SourceKey = "source"sv;
static constexpr std::string_view TitleKey = "title"sv;
static constexpr std::string_view UniqueKey = "unique"sv;
static constexpr std::string_view UrlListKey = "url-list"sv;
static constexpr std::string_view VcodecKey = "vcodec"sv;
static constexpr std::string_view WidthKey = "width"sv;
static constexpr std::string_view XCrossSeedKey = "x_cross_seed"sv;
};
bool tr_torrent_metainfo::parseBenc(std::string_view benc, tr_error** error)