diff options
| author | 2017-02-06 11:49:26 -0800 | |
|---|---|---|
| committer | 2017-02-06 11:49:26 -0800 | |
| commit | 7e6031116248237303ce361bea4db96f2ee4ff4c (patch) | |
| tree | 78e1bd57918d699bc95949855f7e270f2a1c6fb6 | |
| parent | ff1d8da55ed4dc7e646c970a401c869a47fc39e0 (diff) | |
Fixes Treble marshaling of strings embedded in structures from Java
Bug: 35038064
Test: hidl_test_java
Change-Id: Ibfdeae06fdf3982d226a7fa87d4c23feeb8e766e
| -rw-r--r-- | core/jni/android_os_HwBlob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_os_HwBlob.cpp b/core/jni/android_os_HwBlob.cpp index b2dee0689ee0..8590ecf3bb19 100644 --- 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)); |