bail out early in QWinOverlappedIoNotifier::waitForNotified

Calling waitForNotified on an uninitialized notifier will print a
warning and return false. The autotest has been adjusted.

Change-Id: I85e18d6d0a8a5462e1a5d451613add941d89b5fb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

2 files changed, 7 insertions, 1 deletions

diff --git a/src/corelib/io/qwinoverlappedionotifier.cpp b/src/corelib/io/qwinoverlappedionotifier.cpp
index 8f4b8be9a3..7ba862c602 100644
--- a/src/corelib/io/qwinoverlappedionotifier.cpp
+++ b/src/corelib/io/qwinoverlappedionotifier.cpp
@@ -122,6 +122,8 @@ public:
         mutex.unlock();
     }
 
+    using QThread::isRunning;
+
 protected:
     void run()
     {
@@ -216,6 +218,11 @@ void QWinOverlappedIoNotifier::setEnabled(bool enabled)
  */
 bool QWinOverlappedIoNotifier::waitForNotified(int msecs, OVERLAPPED *overlapped)
 {
+    if (!iocp->isRunning()) {
+        qWarning("Called QWinOverlappedIoNotifier::waitForNotified on inactive notifier.");
+        return false;
+    }
+
     forever {
         DWORD result = WaitForSingleObject(hSemaphore, msecs == -1 ? INFINITE : DWORD(msecs));
         if (result == WAIT_OBJECT_0) {
diff --git a/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp b/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp
index bad77b1e06..0944f32443 100644
--- a/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp
+++ b/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp
@@ -175,7 +175,6 @@ void tst_QWinOverlappedIoNotifier::waitForNotified()
     HANDLE hFile = CreateFile(reinterpret_cast<const wchar_t*>(fileName.utf16()),
                               GENERIC_READ, FILE_SHARE_READ,
                               NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
-    QCOMPARE(notifier.waitForNotified(0, 0), false);
     notifier.setHandle(hFile);
     notifier.setEnabled(true);
     QCOMPARE(notifier.waitForNotified(100, 0), false);