Skip to content

Commit e164581

Browse files
committed
fixed vnc protocol version check
1 parent f67b17b commit e164581

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/vnc/vncclient.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ bool VNCClient::establishProtocolVersion(QByteArray &data)
315315
int major = (int)version[MAJOR_INDEX] - 0x30;
316316
int minor = (int)version[MINOR_INDEX] - 0x30;
317317

318-
if (3 != major && (3 != minor || 7 != minor || 8 != minor))
318+
if (3 != major && (3 != minor && 7 != minor && 8 != minor))
319319
{
320320
char version[] = {(char)(major+0x30), (char)(minor+0x30)};
321321
_logger->Log(kWarningLogLevel, base::Time::Now(), std::string("Bad protocol version: ") + std::string(version));
@@ -359,7 +359,6 @@ bool VNCClient::establishSecurity(QByteArray& data)
359359
_communicationError = true;
360360
_socket->close();
361361
return false;
362-
break;
363362
}
364363
case None:
365364
{
@@ -382,7 +381,6 @@ bool VNCClient::establishSecurity(QByteArray& data)
382381
_securityEstablished = true;
383382
_establishedSecurity = VNCAuthentication;
384383
return true;
385-
break;
386384
}
387385
case RA2: break;
388386
case RA2ne: break;
@@ -406,7 +404,6 @@ bool VNCClient::establishSecurity(QByteArray& data)
406404
_communicationError = true;
407405
_socket->close();
408406
return false;
409-
break;
410407
}
411408
case None:
412409
{

0 commit comments

Comments
 (0)