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

2017-02-06 23:41:27 +00:00
parent acf34d8b62 7e60311162
commit 97fca8c035
1 changed files with 1 additions and 1 deletions
--- a/core/jni/android_os_HwBlob.cpp
+++ b/core/jni/android_os_HwBlob.cpp
@ -382,7 +382,7 @@ static void JHwBlob_native_putString(
    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));