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

QEventDispatcherWin32: suppress old {FD_CLOSE|FD_CONNECT} notifications

Browse Source 
As with other network events, we must also ignore these notifications
until WM_QT_ACTIVATENOTIFIERS message is received.

Fixes: QTBUG-82835
Change-Id: I0740bf22e8d1cb0e8b4eba7fc1a27ffe669973ff
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit fe6d84d96e67113846801803c3ba1f20b26e123f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alex Trotsenko 2021-06-15 13:05:49 +03:00 committed by Qt Cherry-pick Bot
parent 9f23445629
commit 1489567b3b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/kernel/qeventdispatcher_win.cpp
View File

@ -622,9 +622,16 @@ void QEventDispatcherWin32::registerSocketNotifier(QSocketNotifier *notifier)
}
sd.event |= event;
} else {
// Disable the events which could be implicitly re-enabled. Next activation
// of socket notifiers will reset the mask.
d->active_fd.insert(sockfd, QSockFd(event, FD_READ | FD_ACCEPT | FD_WRITE | FD_OOB));
// Although WSAAsyncSelect(..., 0), which is called from
// unregisterSocketNotifier(), immediately disables event message
// posting for the socket, it is possible that messages could be
// waiting in the application message queue even if the socket was
// closed. Also, some events could be implicitly re-enabled due
// to system calls. Ignore these superfluous events until all
// pending notifications have been suppressed. Next activation of
// socket notifiers will reset the mask.
d->active_fd.insert(sockfd, QSockFd(event, FD_READ | FD_CLOSE | FD_ACCEPT | FD_WRITE
| FD_CONNECT | FD_OOB));
}
d->postActivateSocketNotifiers();