commit f1821fd07a750563b6abc53a6c914b510281a4a9
author Daichi Hirono <hirono@google.com> Wed May 17 10:39:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 17 10:39:16 2017 +0000
tree 702b14dc7e5aef999f8442c4e3c6129b87cdac28
parent eaf6efa510c27c51535c8509c83d883f8ab2fd61
parent 0efc091522c254e4805cd0cf5fb57ec4c9e7df3a

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

Change-Id: Ic374fc076cc9584c375618a57371669c23aff539

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;
     }
 }