diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-13 17:24:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-13 17:24:49 +0200 |
| commit | 0e81053de80764830246b3faff30d3418e9d895a (patch) | |
| tree | 4a58f3aad9dfe57fdf8cabbf1b90abc528e3d848 | |
| parent | a3d85c07af78c039cfb1269f82caa6f2d9d5b9e1 (diff) | |
| parent | f87100780e7a58f4efcc23d2d80739d630ca9f24 (diff) | |
Merge pull request #10296 from raymoo/fixstreampeerbuffer
Fix broken stream reading in StreamPeerBuffer
| -rw-r--r-- | core/io/stream_peer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/io/stream_peer.cpp b/core/io/stream_peer.cpp index fdad7c7bdf..faf0700edf 100644 --- a/core/io/stream_peer.cpp +++ b/core/io/stream_peer.cpp @@ -459,8 +459,9 @@ Error StreamPeerBuffer::get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_ } PoolVector<uint8_t>::Read r = data.read(); - copymem(p_buffer, r.ptr(), r_received); + copymem(p_buffer, r.ptr() + pointer, r_received); + pointer += r_received; // FIXME: return what? OK or ERR_* } |