1 files changed, 11 insertions, 8 deletions

diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 6db09f94cf..2847b910f3 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -54,6 +54,7 @@
 #include "qurl.h"
 #include "qauthenticator.h"
 #include "private/qiodevice_p.h"
+#include "private/qringbuffer_p.h"
 #include <qendian.h>
 #include <qnetworkinterface.h>
 
@@ -280,7 +281,7 @@ struct QSocks5Data
 
 struct QSocks5ConnectData : public QSocks5Data
 {
-    QByteArray readBuffer;
+    QRingBuffer readBuffer;
 };
 
 struct QSocks5BindData : public QSocks5Data
@@ -1001,13 +1002,17 @@ QSocks5SocketEngine::~QSocks5SocketEngine()
         delete d->bindData;
 }
 
-static QBasicAtomicInt descriptorCounter = Q_BASIC_ATOMIC_INITIALIZER(1);
+static int nextDescriptor()
+{
+    static QBasicAtomicInt counter;
+    return 1 + counter.fetchAndAddRelaxed(1);
+}
 
 bool QSocks5SocketEngine::initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol)
 {
     Q_D(QSocks5SocketEngine);
 
-    d->socketDescriptor = descriptorCounter.fetchAndAddRelaxed(1);
+    d->socketDescriptor = nextDescriptor();
 
     d->socketType = type;
     d->socketProtocol = protocol;
@@ -1193,7 +1198,7 @@ void QSocks5SocketEnginePrivate::_q_controlSocketReadNotification()
             }
             if (buf.size()) {
                 QSOCKS5_DEBUG << dump(buf);
-                connectData->readBuffer += buf;
+                connectData->readBuffer.append(buf);
                 emitReadNotification();
             }
             break;
@@ -1506,7 +1511,7 @@ qint64 QSocks5SocketEngine::read(char *data, qint64 maxlen)
     Q_D(QSocks5SocketEngine);
     QSOCKS5_Q_DEBUG << "read( , maxlen = " << maxlen << ')';
     if (d->mode == QSocks5SocketEnginePrivate::ConnectMode) {
-        if (d->connectData->readBuffer.size() == 0) {
+        if (d->connectData->readBuffer.isEmpty()) {
             if (d->data->controlSocket->state() == QAbstractSocket::UnconnectedState) {
                 //imitate remote closed
                 close();
@@ -1518,9 +1523,7 @@ qint64 QSocks5SocketEngine::read(char *data, qint64 maxlen)
                 return 0;       // nothing to be read
             }
         }
-        qint64 copy = qMin<qint64>(d->connectData->readBuffer.size(), maxlen);
-        memcpy(data, d->connectData->readBuffer.constData(), copy);
-        d->connectData->readBuffer.remove(0, copy);
+        const qint64 copy = d->connectData->readBuffer.read(data, maxlen);
         QSOCKS5_DEBUG << "read" << dump(QByteArray(data, copy));
         return copy;
 #ifndef QT_NO_UDPSOCKET