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

fix: recent coverity warnings (#3788) 

* fix: suppress intentional USE_AFTER_FREE in tests

* fix: unnecessary field check

* fix: in ~tr_verify_worker(), release mutex lock before waiting
This commit is contained in:
Charles Kerr 2022-09-07 19:24:56 -05:00 committed by GitHub
parent b41501eeb8
commit 9fb590d3f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libtransmission/peer-msgs.cc
View File

@ -2174,12 +2174,9 @@ static void peerPulse(void* vmsgs)
auto* msgs = static_cast<tr_peerMsgsImpl*>(vmsgs);
time_t const now = tr_time();
if (msgs->io)
{
updateDesiredRequestCount(msgs);
updateBlockRequests(msgs);
updateMetadataRequests(msgs, now);
}
updateDesiredRequestCount(msgs);
updateBlockRequests(msgs);
updateMetadataRequests(msgs, now);
for (;;)
{

9
libtransmission/verify.cc
View File

@ -272,10 +272,11 @@ void tr_verify_worker::remove(tr_torrent* tor)
tr_verify_worker::~tr_verify_worker()
{
auto const lock = std::lock_guard(verify_mutex_);
stop_current_ = true;
todo_.clear();
{
auto const lock = std::lock_guard(verify_mutex_);
stop_current_ = true;
todo_.clear();
}
while (verify_thread_id_.has_value())
{

30
tests/libtransmission/file-test.cc
View File

@ -307,38 +307,38 @@ TEST_F(FileTest, readFile)
auto constexpr Contents = "hello, world!"sv;
createFileWithContents(path, Contents);
auto n_bytes_read = uint64_t{};
auto n_read = uint64_t{};
tr_error* err = nullptr;
auto buf = std::array<char, 64>{};
auto fd = tr_sys_file_open(path, TR_SYS_FILE_READ, 0);
EXPECT_NE(TR_BAD_SYS_FILE, fd);
// successful read
EXPECT_TRUE(tr_sys_file_read(fd, std::data(buf), std::size(buf), &n_bytes_read, &err));
EXPECT_EQ(Contents, std::string_view(std::data(buf), n_bytes_read));
EXPECT_EQ(std::size(Contents), n_bytes_read);
EXPECT_TRUE(tr_sys_file_read(fd, std::data(buf), std::size(buf), &n_read, &err));
EXPECT_EQ(Contents, std::string_view(std::data(buf), n_read));
EXPECT_EQ(std::size(Contents), n_read);
EXPECT_EQ(nullptr, err) << *err;
// successful read_at
auto const offset = 1U;
EXPECT_TRUE(tr_sys_file_read_at(fd, std::data(buf), std::size(buf), offset, &n_bytes_read, &err));
EXPECT_TRUE(tr_sys_file_read_at(fd, std::data(buf), std::size(buf), offset, &n_read, &err));
auto constexpr Expected = Contents.substr(offset);
EXPECT_EQ(Expected, std::string_view(std::data(buf), n_bytes_read));
EXPECT_EQ(std::size(Expected), n_bytes_read);
EXPECT_EQ(Expected, std::string_view(std::data(buf), n_read));
EXPECT_EQ(std::size(Expected), n_read);
EXPECT_EQ(nullptr, err) << *err;
tr_sys_file_close(fd);
// read from closed file
n_bytes_read = 0;
EXPECT_FALSE(tr_sys_file_read(fd, std::data(buf), std::size(buf), &n_bytes_read, &err));
EXPECT_EQ(0, n_bytes_read);
n_read = 0;
EXPECT_FALSE(tr_sys_file_read(fd, std::data(buf), std::size(buf), &n_read, &err)); // coverity USE_AFTER_FREE
EXPECT_EQ(0, n_read);
EXPECT_NE(nullptr, err);
tr_error_clear(&err);
// read_at from closed file
EXPECT_FALSE(tr_sys_file_read_at(fd, std::data(buf), std::size(buf), offset, &n_bytes_read, &err));
EXPECT_EQ(0, n_bytes_read);
EXPECT_FALSE(tr_sys_file_read_at(fd, std::data(buf), std::size(buf), offset, &n_read, &err)); // coverity USE_AFTER_FREE
EXPECT_EQ(0, n_read);
EXPECT_NE(nullptr, err);
tr_error_clear(&err);
}
@ -1064,11 +1064,11 @@ TEST_F(FileTest, fileCopy)
createFileWithContents(path1, Contents);
// source file exists but is inaccessible
chmod(path1, 0);
(void)chmod(path1, 0);
EXPECT_FALSE(tr_sys_path_copy(path1, test_dir, &err));
EXPECT_NE(nullptr, err);
tr_error_clear(&err);
chmod(path1, 0600);
(void)chmod(path1, 0600);
// source file exists but target is invalid
EXPECT_FALSE(tr_sys_path_copy(path1, test_dir, &err));
@ -1211,7 +1211,7 @@ TEST_F(FileTest, fileTruncate)
EXPECT_EQ(25U, info->size);
// try to truncate a closed file
EXPECT_FALSE(tr_sys_file_truncate(fd, 10, &err));
EXPECT_FALSE(tr_sys_file_truncate(fd, 10, &err)); // coverity USE_AFTER_FREE
EXPECT_NE(nullptr, err);
tr_error_clear(&err);