diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-02-06 23:41:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-06 23:41:28 +0000 |
| commit | 97fca8c035c7daa9cb1058aa37f0d8fb3ec73f70 (patch) | |
| tree | c9812e21025760682b7411402399d78c188d14bc | |
| parent | acf34d8b62dc98f82153c141d3f7b41d48d79904 (diff) | |
| parent | 7e6031116248237303ce361bea4db96f2ee4ff4c (diff) | |
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
| -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)); |