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

WinRT: Do not try to cancel IO for udp sockets on socket close

Browse Source 
As the functionality is not available for udp sockets trying to
call it will cause a crash on socket close.

Task-number: QTBUG-53424
Change-Id: Id80b36a248d12bf360135b2374c0a0efdab3a1f0
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Oliver Wolff 2016-05-18 09:59:25 +02:00 committed by Jani Heikkinen
parent 5cbea54986
commit eba979f695
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/network/socket/qnativesocketengine_winrt.cpp
View File

@ -458,17 +458,19 @@ void QNativeSocketEngine::close()
} }
#if _MSC_VER >= 1900 #if _MSC_VER >= 1900
// To close the connection properly (not with a hard reset) all pending read operation have to if (d->socketType == QAbstractSocket::TcpSocket) {
// be finished or cancelled. The API isn't available on Windows 8.1 though. // To close the connection properly (not with a hard reset) all pending read operation have to
ComPtr<IStreamSocket3> socket3; // be finished or cancelled. The API isn't available on Windows 8.1 though.
hr = d->tcpSocket()->QueryInterface(IID_PPV_ARGS(&socket3)); ComPtr<IStreamSocket3> socket3;
Q_ASSERT_SUCCEEDED(hr); hr = d->tcpSocket()->QueryInterface(IID_PPV_ARGS(&socket3));
Q_ASSERT_SUCCEEDED(hr);
ComPtr<IAsyncAction> action; ComPtr<IAsyncAction> action;
hr = socket3->CancelIOAsync(&action); hr = socket3->CancelIOAsync(&action);
Q_ASSERT_SUCCEEDED(hr); Q_ASSERT_SUCCEEDED(hr);
hr = QWinRTFunctions::await(action); hr = QWinRTFunctions::await(action);
Q_ASSERT_SUCCEEDED(hr); Q_ASSERT_SUCCEEDED(hr);
}
#endif // _MSC_VER >= 1900 #endif // _MSC_VER >= 1900
if (d->readOp) { if (d->readOp) {