From a9c398096bcb342e7d7b1cec6137b0ee8d05872e Mon Sep 17 00:00:00 2001
From: Martin Petersson <Martin.Petersson@nokia.com>
Date: Mon, 11 Jun 2012 15:35:04 +0200
Subject: QIODevice: free memory when buffer is cleared

The QIODevicePrivateLinearBuffer does not deallocate any data on
readAll or clear. This fix will change the buffer so that
data is deallocated on clear, readAll and when read emptied the
buffer.

This is needed for QAbstractSockets that don't have
readBufferMaxSize set, as the buffer will grow but never
decrease in size when you read from it.

Change-Id: Iab42e40182f9ebe0739c99b2d1e820ce287dc931
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/corelib/io/qiodevice_p.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/corelib/io/qiodevice_p.h')

diff --git a/src/corelib/io/qiodevice_p.h b/src/corelib/io/qiodevice_p.h
index 4819ec11a0..362ea4bdf0 100644
--- a/src/corelib/io/qiodevice_p.h
+++ b/src/corelib/io/qiodevice_p.h
@@ -78,8 +78,11 @@ public:
         delete [] buf;
     }
     void clear() {
-        first = buf;
         len = 0;
+        delete [] buf;
+        buf = 0;
+        first = buf;
+        capacity = 0;
     }
     int size() const {
         return len;
@@ -129,10 +132,9 @@ public:
         }
     }
     QByteArray readAll() {
-        char* f = first;
-        int l = len;
+        QByteArray retVal(first, len);
         clear();
-        return QByteArray(f, l);
+        return retVal;
     }
     int readLine(char* target, int size) {
         int r = qMin(size, len);
-- 
cgit v1.2.3