From 7e6031116248237303ce361bea4db96f2ee4ff4c Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Mon, 6 Feb 2017 11:49:26 -0800 Subject: Fixes Treble marshaling of strings embedded in structures from Java Bug: 35038064 Test: hidl_test_java Change-Id: Ibfdeae06fdf3982d226a7fa87d4c23feeb8e766e --- core/jni/android_os_HwBlob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(subBlob->data()), size); + tmp.setToExternal(static_cast(subBlob->data()), size - 1); sp blob = JHwBlob::GetNativeContext(env, thiz); blob->write(offset, &tmp, sizeof(tmp)); -- cgit v1.2.3-59-g8ed1b