aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-10-06 16:37:48 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-07 10:52:41 +0200
commit854520c921298389693623f220177ec84eac693c (patch)
tree50ccbec2525d48d5ae46ac69ea8c6412308a4f1c /src/plugins
parent402363215943976f2fa5b6b2db9b7ca588505df2 (diff)
Debugger: Warn if we receive corrupted packets
Change-Id: Ie99e6806203d5c36dc8d3eb7778a04562c4d6871 Reviewed-on: http://codereview.qt-project.org/6170 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp6
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
index 512ea6571d..f9bf9ddbaa 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
@@ -180,12 +180,18 @@ void QTcpServerConnection::newConnection()
d->socket->setParent(this);
d->protocol = new QPacketProtocol(d->socket, this);
QObject::connect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
+ QObject::connect(d->protocol, SIGNAL(invalidPacket()), this, SLOT(invalidPacket()));
if (d->block) {
d->protocol->waitForReadyRead(-1);
}
}
+void QTcpServerConnection::invalidPacket()
+{
+ qWarning("QDeclarativeDebugServer: Received a corrupted packet! Giving up ...");
+}
+
Q_EXPORT_PLUGIN2(tcpserver, QTcpServerConnection)
QT_END_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
index f6886714c8..315f55a8e3 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
@@ -75,6 +75,7 @@ public:
private Q_SLOTS:
void readyRead();
void newConnection();
+ void invalidPacket();
private:
QTcpServerConnectionPrivate *d_ptr;