1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Torrent example: fix crash

Browse Source 
Yet Another Side Effect of not keeping iterator stability.

Although not idiomatic, the pattern

  while (i != e) {
    auto cur = i++;
    if (cond)
      erase(cur);
  }

was actually correct. Move to the idiomatic erase pattern
instead (it = cont.erase(it)).

The example still has memory problems all over the place on
shutdown. At least now it doesn't crash when running.

Change-Id: I30bd2c4e2b3fa7fe4e28d4426ff3d894b9bae103
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Giuseppe D'Angelo 2020-05-05 16:49:03 +02:00
parent 30be6c41d5
commit 1018dba04f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/network/torrent/ratecontroller.cpp
View File

@ -129,7 +129,7 @@ void RateController::transfer()
auto current = it++; auto current = it++;
PeerWireClient *socket = *current; PeerWireClient *socket = *current;
if (socket->state() != QAbstractSocket::ConnectedState) { if (socket->state() != QAbstractSocket::ConnectedState) {
pendingSockets.erase(current); it = pendingSockets.erase(current);
continue; continue;
} }
@ -158,7 +158,7 @@ void RateController::transfer()
if (dataTransferred && socket->canTransferMore()) if (dataTransferred && socket->canTransferMore())
canTransferMore = true; canTransferMore = true;
else else
pendingSockets.erase(current); it = pendingSockets.erase(current);
} }
} while (canTransferMore && (bytesToWrite > 0 || bytesToRead > 0) && !pendingSockets.isEmpty()); } while (canTransferMore && (bytesToWrite > 0 || bytesToRead > 0) && !pendingSockets.isEmpty());