ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the CHECK failure into function failure.

Browse source 
Previously we have CHECK in WriteInternal function to observe short
writing. However it turns out short write can happen according to the
bug report.

To prevent app from crashing due to CHECK failure, the CL removes the
CHECK and let WriteInternal return a failure value.

Bug: 37561460
Test: libappfuse_tests, manually re-wrote the return value of write()
      and checked logcat.
Change-Id: I6a1e233c3ddb8eb68f59e7c606ad0459b5ca2c6e
This commit is contained in:
Daichi Hirono 2017-05-12 16:24:48 +09:00
parent a0aaf24d62
commit 3df060d6d0
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libappfuse/FuseBuffer.cc
View file

@ -119,7 +119,12 @@ ResultOrAgain WriteInternal(const FuseMessage<T>* self, int fd, int sockflag, co
return ResultOrAgain::kFailure;
}
}
CHECK(static_cast<uint32_t>(result) == header.len);
if (static_cast<unsigned int>(result) != header.len) {
LOG(ERROR) << "Written bytes " << result << " is different from length in header "
<< header.len;
return ResultOrAgain::kFailure;
}
return ResultOrAgain::kSuccess;
}
}