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

fix: semantics for tr_peer_socket dtor, move ctor, and move assignment 

Default implementations for these functions may leak sockets during
destructing and moving.
This commit is contained in:
InsaneKnight 2023-01-20 08:28:56 +00:00 committed by GitHub
parent 770da79cf3
commit 8755207dcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libtransmission/peer-socket.h
View File

@ -32,12 +32,28 @@ public:
tr_peer_socket() = default;
tr_peer_socket(tr_session const* session, tr_address const& address, tr_port port, tr_socket_t sock);
tr_peer_socket(tr_address const& address, tr_port port, struct UTPSocket* const sock);
tr_peer_socket(tr_peer_socket&&) = default;
tr_peer_socket(tr_peer_socket&& s)
{
*this = std::move(s);
}
tr_peer_socket(tr_peer_socket const&) = delete;
tr_peer_socket& operator=(tr_peer_socket&&) = default;
tr_peer_socket& operator=(tr_peer_socket&& s)
{
close();
handle = s.handle;
address_ = s.address_;
port_ = s.port_;
type_ = s.type_;
// invalidate s.type_, s.handle so s.close() won't break anything
s.type_ = Type::None;
s.handle = {};
return *this;
}
tr_peer_socket& operator=(tr_peer_socket const&) = delete;
~tr_peer_socket() = default;
~tr_peer_socket()
{
close();
}
void close();
size_t try_write(Buffer& buf, size_t max, tr_error** error) const;