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

_q_networkSessionStateChanged - fix weird logic

Browse Source 
a != A || a != B looks suspiciously wrong.
Found, unfortunately, only by Coverity (CIDs 152247, 152249).

Change-Id: Ia7ec810dde2a3a33ae6fc5644a4eebf279dcffe8
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
This commit is contained in:
Timur Pocheptsov 2016-04-18 16:30:43 +02:00
parent e27fae353c
commit a9e7bf9ffd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/access/qnetworkreplyhttpimpl.cpp
View File

@ -1950,7 +1950,7 @@ void QNetworkReplyHttpImplPrivate::_q_networkSessionConnected()
void QNetworkReplyHttpImplPrivate::_q_networkSessionStateChanged(QNetworkSession::State sessionState) void QNetworkReplyHttpImplPrivate::_q_networkSessionStateChanged(QNetworkSession::State sessionState)
{ {
if (sessionState == QNetworkSession::Disconnected if (sessionState == QNetworkSession::Disconnected
&& (state != Idle || state != Reconnecting)) { && state != Idle && state != Reconnecting) {
error(QNetworkReplyImpl::NetworkSessionFailedError, error(QNetworkReplyImpl::NetworkSessionFailedError,
QCoreApplication::translate("QNetworkReply", "Network session error.")); QCoreApplication::translate("QNetworkReply", "Network session error."));
finished(); finished();

2
src/network/access/qnetworkreplyimpl.cpp
View File

@ -319,7 +319,7 @@ void QNetworkReplyImplPrivate::_q_networkSessionConnected()
void QNetworkReplyImplPrivate::_q_networkSessionStateChanged(QNetworkSession::State sessionState) void QNetworkReplyImplPrivate::_q_networkSessionStateChanged(QNetworkSession::State sessionState)
{ {
if (sessionState == QNetworkSession::Disconnected if (sessionState == QNetworkSession::Disconnected
&& (state != Idle || state != Reconnecting)) { && state != Idle && state != Reconnecting) {
error(QNetworkReplyImpl::NetworkSessionFailedError, error(QNetworkReplyImpl::NetworkSessionFailedError,
QCoreApplication::translate("QNetworkReply", "Network session error.")); QCoreApplication::translate("QNetworkReply", "Network session error."));
finished(); finished();