diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2014-02-02 18:34:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-02 22:42:37 +0100 |
| commit | 8cba90b645c2606f0c5de6e50f2efbe7edcbf8a5 (patch) | |
| tree | 078c0e1a59fe022cf979f69fceba4bb68c11bacd /src | |
| parent | 8a8666f9e7f830f7640da7d3afc02361054766e8 (diff) | |
Remove parenting of QWebSockets in QWebSocketServer
Because QWebSocketServer took ownership of QWebSocket objects,
the objects were double deleted, leading to crashes.
Change-Id: I51192daba8e8739bc68a94c7fe2a8a972ac9d38e
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/websockets/qwebsocketserver_p.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp index 47f24d2..617e8fc 100644 --- a/src/websockets/qwebsocketserver_p.cpp +++ b/src/websockets/qwebsocketserver_p.cpp @@ -427,7 +427,6 @@ void QWebSocketServerPrivate::handshakeReceived() request, response); if (pWebSocket) { - pWebSocket->setParent(this); addPendingConnection(pWebSocket); Q_EMIT q->newConnection(); success = true; |