From 656c02f128c56177c48b3de47f7b1e17dbbfa4d3 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Thu, 25 Mar 2010 14:52:53 +0100
Subject: QNAM HTTP: Fix crazy crash when exiting application

This fixes a crash in tst_qnetworkreply and in some QtWebKit
based browsers.
It was related to adding a QPointer on an already
deleted QHttpNetworkConnection object. By converting
an existing normal pointer to a QPointer we set
it a 0-pointer and are safe.
https://bugs.webkit.org/show_bug.cgi?id=36290

Reviewed-by: joao
Reviewed-by: gabi
---
 src/network/access/qhttpnetworkconnectionchannel.cpp | 2 +-
 src/network/access/qhttpnetworkconnectionchannel_p.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 82bc14f..0804498 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -939,7 +939,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
         errorCode = QNetworkReply::UnknownNetworkError;
         break;
     }
-    QPointer<QObject> that = connection;
+    QPointer<QHttpNetworkConnection> that = connection;
     QString errorString = connection->d_func()->errorDetail(errorCode, socket, socket->errorString());
     if (send2Reply) {
         if (reply) {
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 5032d2b..6ec47c1 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -138,7 +138,7 @@ public:
     {}
 
     void setConnection(QHttpNetworkConnection *c) {connection = c;}
-    QHttpNetworkConnection *connection;
+    QPointer<QHttpNetworkConnection> connection;
 
     void init();
     void close();
-- 
cgit v0.12