Merge "Fix buffer size check in replyRead" into pi-dev am: cf7b8a1406

am: 6fde033eae

Change-Id: Ic49deb1544e34fd4692faa8d6f29d3b3bd8a85f0
This commit is contained in:
Ryo Hashimoto
2018-03-16 06:03:21 +00:00
committed by android-build-merger

View File

@@ -166,8 +166,8 @@ void com_android_internal_os_FuseAppLoop_replyWrite(
void com_android_internal_os_FuseAppLoop_replyRead(
JNIEnv* env, jobject self, jlong ptr, jlong unique, jint size, jbyteArray data) {
ScopedByteArrayRO array(env, data);
CHECK(size >= 0);
CHECK(static_cast<size_t>(size) < array.size());
CHECK_GE(size, 0);
CHECK_LE(static_cast<size_t>(size), array.size());
if (!reinterpret_cast<fuse::FuseAppLoop*>(ptr)->ReplyRead(unique, size, array.get())) {
reinterpret_cast<fuse::FuseAppLoop*>(ptr)->Break();
}