Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16ffdb88 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge January 2020 Security Release into master"

parents 6f435621 b124bd29

libs/sensor/Sensor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -577,7 +577,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) {