diff options
author | Daichi Hirono | 2017-05-17 05:39:16 -0500 |
---|---|---|
committer | android-build-merger | 2017-05-17 05:39:16 -0500 |
commit | 4847c7f708bdcba64244c2063b6f999fe44f0964 (patch) | |
tree | 702b14dc7e5aef999f8442c4e3c6129b87cdac28 | |
parent | d6b71b91530f9b865eaf0f602f94f6f034a4d31c (diff) | |
parent | bf6e949727d6d86a3e8e3fa5c5f641872134d2a1 (diff) | |
download | platform-system-core-4847c7f708bdcba64244c2063b6f999fe44f0964.tar.gz platform-system-core-4847c7f708bdcba64244c2063b6f999fe44f0964.tar.xz platform-system-core-4847c7f708bdcba64244c2063b6f999fe44f0964.zip |
Merge "Change the CHECK failure into function failure." into oc-dev
am: bf6e949727
Change-Id: Ic374fc076cc9584c375618a57371669c23aff539
-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 | } |