diff options
author | Konstantinos Menychtas <kmenychtas@google.com> | 2015-07-23 23:09:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-23 23:09:55 +0000 |
commit | 150fe17c1c48e14dcce91e26e2ff68c348b9aa36 (patch) | |
tree | 81efc2672271c4565e4bf17e119c47eb80d0d490 | |
parent | 3ba99fb8b49801f6d2dab2f20b86234b7c8263c9 (diff) | |
parent | 633f157a865b34fcb66843e4dd3151aa2f792147 (diff) | |
download | device_generic_goldfish-150fe17c1c48e14dcce91e26e2ff68c348b9aa36.tar.gz device_generic_goldfish-150fe17c1c48e14dcce91e26e2ff68c348b9aa36.tar.bz2 device_generic_goldfish-150fe17c1c48e14dcce91e26e2ff68c348b9aa36.zip |
Merge "opengl: Fix QemuPipeStream::readFully reading beyond end of buffer" into mnc-dev
-rw-r--r-- | opengl/system/OpenglSystemCommon/QemuPipeStream.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp b/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp index 57983704..3a531610 100644 --- a/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp +++ b/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp @@ -122,12 +122,14 @@ const unsigned char *QemuPipeStream::readFully(void *buf, size_t len) //DBG(">> QemuPipeStream::readFully %d\n", len); if (!valid()) return NULL; if (!buf) { - if (len>0) ERR("QemuPipeStream::readFully failed, buf=NULL, len %d", len); + if (len > 0) { + ERR("QemuPipeStream::readFully failed, buf=NULL, len %zu", len); + } return NULL; // do not allow NULL buf in that implementation } size_t res = len; while (res > 0) { - ssize_t stat = ::read(m_sock, (char *)(buf) + len - res, len); + ssize_t stat = ::read(m_sock, (char *)(buf) + len - res, res); if (stat == 0) { // client shutdown; return NULL; @@ -135,8 +137,8 @@ const unsigned char *QemuPipeStream::readFully(void *buf, size_t len) if (errno == EINTR) { continue; } else { - ERR("QemuPipeStream::readFully failed (buf %p): %s\n", - buf, strerror(errno)); + ERR("QemuPipeStream::readFully failed (buf %p, len %zu" + ", res %zu): %s\n", buf, len, res, strerror(errno)); return NULL; } } else { |