From f40cf77b0fa1cd5353ca866a7a5799da9f303081 Mon Sep 17 00:00:00 2001
From: Alex Trotsenko <alex1973tr@gmail.com>
Date: Sat, 28 Mar 2015 16:47:41 +0200
Subject: QIODevice: do not change the 'pos' member for sequential devices

Concept of 'current position' exists only for random-access devices.
As documented, for sequential devices QIODevice::pos() must always
return 0. Prevent a modification of the internal 'pos' member in
QIODevice::readAll() method to follow this rule.

Change-Id: Ida2ee6a629ccfc3068d62f95ab1064ada13fdda5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp | 44 +++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'tests/auto/corelib/io')

diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index 30c1f2be59..f756588e80 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -58,6 +58,7 @@ private slots:
     void readLine2();
 
     void peekBug();
+    void readAllKeepPosition();
 };
 
 void tst_QIODevice::initTestCase()
@@ -584,5 +585,48 @@ void tst_QIODevice::peekBug()
 
 }
 
+class SequentialReadBuffer : public QIODevice
+{
+public:
+    SequentialReadBuffer(const char *data) : QIODevice(), buf(data), offset(0) { }
+
+    bool isSequential() const Q_DECL_OVERRIDE { return true; }
+    const QByteArray &buffer() const { return buf; }
+
+protected:
+    qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE
+    {
+        maxSize = qMin(maxSize, qint64(buf.size() - offset));
+        memcpy(data, buf.constData() + offset, maxSize);
+        offset += maxSize;
+        return maxSize;
+    }
+    qint64 writeData(const char * /* data */, qint64 /* maxSize */) Q_DECL_OVERRIDE
+    {
+        return -1;
+    }
+
+private:
+    QByteArray buf;
+    int offset;
+};
+
+// Test readAll() on position change for sequential device
+void tst_QIODevice::readAllKeepPosition()
+{
+    SequentialReadBuffer buffer("Hello world!");
+    buffer.open(QIODevice::ReadOnly);
+    char c;
+
+    QVERIFY(buffer.getChar(&c));
+    QCOMPARE(buffer.pos(), qint64(0));
+    buffer.ungetChar(c);
+    QCOMPARE(buffer.pos(), qint64(0));
+
+    QByteArray resultArray = buffer.readAll();
+    QCOMPARE(buffer.pos(), qint64(0));
+    QCOMPARE(resultArray, buffer.buffer());
+}
+
 QTEST_MAIN(tst_QIODevice)
 #include "tst_qiodevice.moc"
-- 
cgit v1.2.3