summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2009-09-22 12:50:48 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2009-09-22 12:50:48 (GMT)
commit394fddbe1ed93f8aafc29ace8217ad8d77e7276f (patch)
treecb7d6905525b34d1a80b15e7b859c667deb2a476
parent787d5dc3ccd913b125979ee83d5249dcf78fb8ea (diff)
downloadQt-394fddbe1ed93f8aafc29ace8217ad8d77e7276f.zip
Qt-394fddbe1ed93f8aafc29ace8217ad8d77e7276f.tar.gz
Qt-394fddbe1ed93f8aafc29ace8217ad8d77e7276f.tar.bz2
Fix memleak in tst_qhttpnetworkconnection
Reviewed-by: TrustMe
-rw-r--r--src/corelib/io/qnoncontiguousbytedevice_p.h4
-rw-r--r--tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h
index e55a46c..34d6980 100644
--- a/src/corelib/io/qnoncontiguousbytedevice_p.h
+++ b/src/corelib/io/qnoncontiguousbytedevice_p.h
@@ -72,9 +72,11 @@ public:
void disableReset();
virtual qint64 size() = 0;
+ virtual ~QNonContiguousByteDevice();
+
protected:
QNonContiguousByteDevice();
- virtual ~QNonContiguousByteDevice();
+
bool resetDisabled;
Q_SIGNALS:
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index e1e25d2..470e57f 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -320,6 +320,7 @@ void tst_QHttpNetworkConnection::put()
QByteArray array = data.toLatin1();
QNonContiguousByteDevice *bd = QNonContiguousByteDeviceFactory::create(&array);
+ bd->setParent(this);
request.setUploadByteDevice(bd);
finishedCalled = false;
@@ -411,6 +412,7 @@ void tst_QHttpNetworkConnection::post()
QByteArray array = data.toLatin1();
QNonContiguousByteDevice *bd = QNonContiguousByteDeviceFactory::create(&array);
+ bd->setParent(this);
request.setUploadByteDevice(bd);
QHttpNetworkReply *reply = connection.sendRequest(request);