diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
| commit | 2add2dbdaa9ff6ca6637ca22d6a9b7c7027751be (patch) | |
| tree | 585628b0ceacfbdef5b9661c4043b9f71dfe9b01 /src/network/access/qnetworkreplywasmimpl.cpp | |
| parent | f792fed2ff519ffac1436e41e47cc0504d253a77 (diff) | |
| parent | 4eda22ea0db1fc571ae9f44a68825056e6245548 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/network/access/http2/hpacktable_p.h
Change-Id: Ie0c296667dfdebba84f4858056a1ac80c24ee7df
Diffstat (limited to 'src/network/access/qnetworkreplywasmimpl.cpp')
| -rw-r--r-- | src/network/access/qnetworkreplywasmimpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkreplywasmimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp index df4e034d97b..b1e9853a506 100644 --- a/src/network/access/qnetworkreplywasmimpl.cpp +++ b/src/network/access/qnetworkreplywasmimpl.cpp @@ -265,7 +265,7 @@ qint64 QNetworkReplyWasmImpl::readData(char *data, qint64 maxlen) Q_D(QNetworkReplyWasmImpl); qint64 howMuch = qMin(maxlen, (d->downloadBuffer.size() - d->downloadBufferReadPosition)); - memcpy(data, d->downloadBuffer.constData(), howMuch); + memcpy(data, d->downloadBuffer.constData() + d->downloadBufferReadPosition, howMuch); d->downloadBufferReadPosition += howMuch; return howMuch; |