whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QHostInfoRunnable: make the lookupFinished() call more robust 

Use a scope guard to reliably mark the runnable as finished with the
manager, lest a deleted runnable lingers in the manager's
currentLookups for too long/ever.

Change-Id: I89eff49931d0428f4e75789a0a1188edb1f66220
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Marc Mutz 2019-07-04 15:39:36 +02:00
parent 60ca2f5f7c
commit e6c646a678
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/kernel/qhostinfo.cpp
View File

@ -47,6 +47,7 @@
#include <qabstracteventdispatcher.h>
#include <qcoreapplication.h>
#include <qmetaobject.h>
#include <qscopeguard.h>
#include <qstringlist.h>
#include <qthread.h>
#include <qurl.h>
@ -826,11 +827,10 @@ QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i, const QObject *re
void QHostInfoRunnable::run()
{
QHostInfoLookupManager *manager = theHostInfoLookupManager();
const auto sg = qScopeGuard([&] { manager->lookupFinished(this); });
// check aborted
if (manager->wasAborted(id)) {
manager->lookupFinished(this);
if (manager->wasAborted(id))
return;
}
QHostInfo hostInfo;
@ -852,10 +852,8 @@ void QHostInfoRunnable::run()
}
// check aborted again
if (manager->wasAborted(id)) {
manager->lookupFinished(this);
if (manager->wasAborted(id))
return;
}
// signal emission
hostInfo.setLookupId(id);
@ -879,8 +877,6 @@ void QHostInfoRunnable::run()
}
#endif
manager->lookupFinished(this);
// thread goes back to QThreadPool
}