diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-07-19 22:04:28 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-07-19 22:04:28 +0900 |
| commit | dad70b4c5201ece044ecb663bb91b48ba8bd84a3 (patch) | |
| tree | c7654c59b90203fb415b18b4c986b097df8ae6d4 /src/kernel/qeventloop_unix_glib.cpp | |
| parent | d6867cf92e3f65b61a7289a478f97910b9fa4965 (diff) | |
| download | qt3-dad70b4c5201ece044ecb663bb91b48ba8bd84a3.tar.gz qt3-dad70b4c5201ece044ecb663bb91b48ba8bd84a3.zip | |
Added safety harness for currentThreadObject() usage.
currentThreadObject() returns a null pointer if the
current thread was not started using the QThread API.
This relates to bug 1748.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/kernel/qeventloop_unix_glib.cpp')
| -rw-r--r-- | src/kernel/qeventloop_unix_glib.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp index feff675..c41acce 100644 --- a/src/kernel/qeventloop_unix_glib.cpp +++ b/src/kernel/qeventloop_unix_glib.cpp @@ -688,7 +688,9 @@ int QEventLoop::activateTimers() QTimerEvent e( t->id ); #if defined(QT_THREAD_SUPPORT) // Be careful...the current thread may not be the target object's thread! - if ((!t->obj) || (QThread::currentThreadObject()->threadPostedEventsDisabled()) || (t->obj && (t->obj->contextThreadObject() == QThread::currentThreadObject()))) { + if ((!t->obj) || + (QThread::currentThreadObject() && QThread::currentThreadObject()->threadPostedEventsDisabled()) || + (t->obj && t->obj->contextThreadObject() == QThread::currentThreadObject())) { QApplication::sendEvent( t->obj, &e ); // send event } else { @@ -731,7 +733,9 @@ int QEventLoop::activateSocketNotifiers() sn->pending = FALSE; #if defined(QT_THREAD_SUPPORT) // Be careful...the current thread may not be the target object's thread! - if ((!sn->obj) || (QThread::currentThreadObject()->threadPostedEventsDisabled()) || (sn->obj && (sn->obj->contextThreadObject() == QThread::currentThreadObject()))) { + if ((!sn->obj) || + (QThread::currentThreadObject() && QThread::currentThreadObject()->threadPostedEventsDisabled()) || + (sn->obj && sn->obj->contextThreadObject() == QThread::currentThreadObject())) { QApplication::sendEvent( sn->obj, &event ); // send event } else { |