commit 6b4d5e5e881a9446ecaa0c62a469d1ff5aed55bc
author Daichi Hirono <hirono@google.com> Wed May 17 10:42:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 17 10:42:20 2017 +0000
tree 4f5dcb4d37def37cdc9c381336189fe0e39850c1
parent 3d5e160790c69580b85cc357447af21644473319
parent f1821fd07a750563b6abc53a6c914b510281a4a9

Merge "Change the CHECK failure into function failure." into oc-dev am: bf6e949727
am: 4847c7f708

Change-Id: Iea6c547dc36ab3910f4100d0dbf60a56201a0107

libappfuse/FuseBuffer.cc

diff --git a/libappfuse/FuseBuffer.cc b/libappfuse/FuseBuffer.cc
index fd69849..653e96b 100644
--- a/libappfuse/FuseBuffer.cc
+++ b/libappfuse/FuseBuffer.cc
@@ -119,7 +119,12 @@
                     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;
     }
 }