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

Merge pull request #2677 from transmission/fix/bd68d3a-final-info-hash-in-makemeta 

fix: unreleased regression in makemeta pieces hashes
This commit is contained in:
Charles Kerr 2022-02-21 19:57:14 -06:00 committed by GitHub
parent 41b13db874 5842e8bc74
commit 3f7134d47b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libtransmission/makemeta.cc
View File

@ -281,9 +281,10 @@ static std::vector<std::byte> getHashInfo(tr_metainfo_builder* b)
{ {
TR_ASSERT(b->pieceIndex < b->pieceCount); TR_ASSERT(b->pieceIndex < b->pieceCount);
uint32_t const this_piece_size = std::min(uint64_t{ b->pieceSize }, totalRemain);
buf.resize(this_piece_size);
auto* bufptr = std::data(buf); auto* bufptr = std::data(buf);
uint32_t const thisPieceSize = std::min(uint64_t{ b->pieceSize }, totalRemain); uint64_t leftInPiece = this_piece_size;
uint64_t leftInPiece = thisPieceSize;
while (leftInPiece != 0) while (leftInPiece != 0)
{ {
@ -316,7 +317,7 @@ static std::vector<std::byte> getHashInfo(tr_metainfo_builder* b)
} }
} }
TR_ASSERT(bufptr - std::data(buf) == (int)thisPieceSize); TR_ASSERT(bufptr - std::data(buf) == (int)this_piece_size);
TR_ASSERT(leftInPiece == 0); TR_ASSERT(leftInPiece == 0);
auto const digest = tr_sha1(buf); auto const digest = tr_sha1(buf);
if (!digest) if (!digest)
@ -335,7 +336,7 @@ static std::vector<std::byte> getHashInfo(tr_metainfo_builder* b)
break; break;
} }
totalRemain -= thisPieceSize; totalRemain -= this_piece_size;
++b->pieceIndex; ++b->pieceIndex;
} }
@ -415,7 +416,11 @@ static void makeInfoDict(tr_variant* dict, tr_metainfo_builder* builder)
tr_variantDictAddRaw(dict, TR_KEY_pieces, std::data(piece_hashes), std::size(piece_hashes)); tr_variantDictAddRaw(dict, TR_KEY_pieces, std::data(piece_hashes), std::size(piece_hashes));
} }
tr_variantDictAddInt(dict, TR_KEY_private, builder->isPrivate ? 1 : 0); if (builder->isPrivate)
{
tr_variantDictAddInt(dict, TR_KEY_private, 1);
}
if (builder->source != nullptr) if (builder->source != nullptr)
{ {
tr_variantDictAddStr(dict, TR_KEY_source, builder->source); tr_variantDictAddStr(dict, TR_KEY_source, builder->source);