commit 97fca8c035c7daa9cb1058aa37f0d8fb3ec73f70
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 06 23:41:27 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 06 23:41:28 2017 +0000
tree c9812e21025760682b7411402399d78c188d14bc
parent acf34d8b62dc98f82153c141d3f7b41d48d79904
parent 7e6031116248237303ce361bea4db96f2ee4ff4c

Merge "Fixes Treble marshaling of strings embedded in structures from Java"

core/jni/android_os_HwBlob.cpp

diff --git a/core/jni/android_os_HwBlob.cpp b/core/jni/android_os_HwBlob.cpp
index b2dee06..8590ecf 100644
--- a/core/jni/android_os_HwBlob.cpp
+++ b/core/jni/android_os_HwBlob.cpp
@@ -382,7 +382,7 @@
     s = nullptr;
 
     hidl_string tmp;
-    tmp.setToExternal(static_cast<const char *>(subBlob->data()), size);
+    tmp.setToExternal(static_cast<const char *>(subBlob->data()), size - 1);
 
     sp<JHwBlob> blob = JHwBlob::GetNativeContext(env, thiz);
     blob->write(offset, &tmp, sizeof(tmp));