summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2011-04-29 14:50:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-29 14:50:09 -0700
commit7da9ff5b970936eeffae86af1d288fb0662741cd (patch)
tree8b470fea53b93d4d0add6064c7548bf480b238a9
parent939ccad344c5f32bc9e7dbfa80648c1e75cac62a (diff)
parentc1f52d3f754ec7a295de7f1c4158030fba8bcf8a (diff)
downloadframeworks_base-7da9ff5b970936eeffae86af1d288fb0662741cd.zip
frameworks_base-7da9ff5b970936eeffae86af1d288fb0662741cd.tar.gz
frameworks_base-7da9ff5b970936eeffae86af1d288fb0662741cd.tar.bz2
Merge "Fix fifo size check code."
-rw-r--r--libs/rs/rsContext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 50f5f55..1592f81 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -598,7 +598,7 @@ RsMessageToClientType Context::getMessageToClient(void *data, size_t *receiveLen
*subID = d[0];
//LOGE("getMessageToClient %i %i", commandID, *subID);
- if (bufferLen >= bytesData) {
+ if (bufferLen >= (*receiveLen)) {
memcpy(data, d+1, *receiveLen);
mIO.mToClient.next();
return (RsMessageToClientType)commandID;