From d58cf5acb863eddbbeb9982439965e259045940e Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 7 Oct 2019 17:30:23 -0700 Subject: Sensor: use FlattenableUtils::align Since it memsets skipped over memory now. Bug: 141890807 Test: boot, check buffer is zero'd here Change-Id: Ieb3cd90215a3ccc1dc43365ecde251a50db08553 --- libs/sensor/Sensor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs') diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp index 139987e6a9..abc910302c 100644 --- a/libs/sensor/Sensor.cpp +++ b/libs/sensor/Sensor.cpp @@ -577,7 +577,8 @@ void Sensor::flattenString8(void*& buffer, size_t& size, uint32_t len = static_cast(string8.length()); FlattenableUtils::write(buffer, size, len); memcpy(static_cast(buffer), string8.string(), len); - FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len)); + FlattenableUtils::advance(buffer, size, len); + size -= FlattenableUtils::align<4>(buffer); } bool Sensor::unflattenString8(void const*& buffer, size_t& size, String8& outputString8) { -- cgit v1.2.3-59-g8ed1b