diff options
| author | Steven Moreland <smoreland@google.com> | 2019-10-07 17:30:23 -0700 |
|---|---|---|
| committer | Kyriakos Ispoglou <ispo@google.com> | 2019-11-07 16:20:11 -0800 |
| commit | 45f4da1e90346eea757520edf463f5dc5c305a49 (patch) | |
| tree | 764b64777a3e16b2dd6e39aca0dce1bb1263c977 | |
| parent | f2efa0e984618246ce796f36bf3e946e033510f2 (diff) | |
| download | native-45f4da1e90346eea757520edf463f5dc5c305a49.tar.gz | |
Sensor: use FlattenableUtils::alignandroid-8.0.0_r42
Since it memsets skipped over memory now.
Bug: 141890807
Test: boot, check buffer is zero'd here
Change-Id: Ieb3cd90215a3ccc1dc43365ecde251a50db08553
(cherry picked from commit d58cf5acb863eddbbeb9982439965e259045940e)
(cherry picked from commit dbd0eecfc7570231d5cbb76678b0358c43ee6d3c)
| -rw-r--r-- | libs/sensor/Sensor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp index c2d477e4b5..ae7e5f3958 100644 --- a/libs/sensor/Sensor.cpp +++ b/libs/sensor/Sensor.cpp @@ -557,7 +557,8 @@ void Sensor::flattenString8(void*& buffer, size_t& size, uint32_t len = static_cast<uint32_t>(string8.length()); FlattenableUtils::write(buffer, size, len); memcpy(static_cast<char*>(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) { |