diff options
author | TreeHugger Robot | 2017-05-16 22:22:26 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2017-05-16 22:22:27 -0500 |
commit | bf6e949727d6d86a3e8e3fa5c5f641872134d2a1 (patch) | |
tree | 7dd688b5acc3df94fb062ee8a422d99861cfa3b8 | |
parent | 165dad791d05975d6c13155246e256a379181dcf (diff) | |
parent | 3df060d6d0e953bacee8e7899d18b404b5a7262f (diff) | |
download | platform-system-core-bf6e949727d6d86a3e8e3fa5c5f641872134d2a1.tar.gz platform-system-core-bf6e949727d6d86a3e8e3fa5c5f641872134d2a1.tar.xz platform-system-core-bf6e949727d6d86a3e8e3fa5c5f641872134d2a1.zip |
Merge "Change the CHECK failure into function failure." into oc-dev
-rw-r--r-- | libappfuse/FuseBuffer.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libappfuse/FuseBuffer.cc b/libappfuse/FuseBuffer.cc index fd69849a7..653e96b28 100644 --- a/libappfuse/FuseBuffer.cc +++ b/libappfuse/FuseBuffer.cc | |||
@@ -119,7 +119,12 @@ ResultOrAgain WriteInternal(const FuseMessage<T>* self, int fd, int sockflag, co | |||
119 | return ResultOrAgain::kFailure; | 119 | return ResultOrAgain::kFailure; |
120 | } | 120 | } |
121 | } | 121 | } |
122 | CHECK(static_cast<uint32_t>(result) == header.len); | 122 | |
123 | if (static_cast<unsigned int>(result) != header.len) { | ||
124 | LOG(ERROR) << "Written bytes " << result << " is different from length in header " | ||
125 | << header.len; | ||
126 | return ResultOrAgain::kFailure; | ||
127 | } | ||
123 | return ResultOrAgain::kSuccess; | 128 | return ResultOrAgain::kSuccess; |
124 | } | 129 | } |
125 | } | 130 | } |