Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 03:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixes for assert in Connection and ControlPacket create

Browse source
This commit is contained in:
Stephen Birarda 2015-07-30 17:20:22 -07:00
parent 1724e3c632
commit 367fa7b07b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/udt/Connection.cpp
View file

@ -76,7 +76,7 @@ void Connection::sendACK(bool wasCausedBySyncTimeout) {
auto currentTime = high_resolution_clock::now(); auto currentTime = high_resolution_clock::now();
SequenceNumber nextACKNumber = nextACK(); SequenceNumber nextACKNumber = nextACK();
Q_ASSERT_X(nextACKNumber < _lastSentACK, "Connection::sendACK", "Sending lower ACK, something is wrong"); Q_ASSERT_X(nextACKNumber >= _lastSentACK, "Connection::sendACK", "Sending lower ACK, something is wrong");
if (nextACKNumber == _lastSentACK) { if (nextACKNumber == _lastSentACK) {
// We already sent this ACK, but check if we should re-send it. // We already sent this ACK, but check if we should re-send it.

4
libraries/networking/src/udt/ControlPacket.cpp
View file

@ -46,12 +46,12 @@ std::unique_ptr<ControlPacket> ControlPacket::create(Type type, qint64 size) {
std::unique_ptr<ControlPacket> controlPacket; std::unique_ptr<ControlPacket> controlPacket;
if (size == -1) { if (size == -1) {
return ControlPacket::create(type); return std::unique_ptr<ControlPacket>(new ControlPacket(type));
} else { } else {
// Fail with invalid size // Fail with invalid size
Q_ASSERT(size >= 0); Q_ASSERT(size >= 0);
return ControlPacket::create(type, size); return std::unique_ptr<ControlPacket>(new ControlPacket(type, size));
} }
} }