ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix flattening/unflattening of android::Sensor.

Browse Source 
Write string lengths as uint32_t so that their width is
the same on 32 and 64 bit processes.

Note that this fixes another bug as a side effect; getFlattenedSize
was assuming that sizeof(uint32_t) == sizeof(size_t).

Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
This commit is contained in:
Narayan Kamath 2014-05-30 14:40:13 +01:00
parent 63645c69e0
commit 403ec9f15a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/gui/Sensor.cpp
View File

@ -134,11 +134,11 @@ status_t Sensor::flatten(void* buffer, size_t size) const {
return NO_MEMORY; return NO_MEMORY;
} }
FlattenableUtils::write(buffer, size, mName.length()); FlattenableUtils::write(buffer, size, static_cast<uint32_t>(mName.length()));
memcpy(static_cast<char*>(buffer), mName.string(), mName.length()); memcpy(static_cast<char*>(buffer), mName.string(), mName.length());
FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(mName.length())); FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(mName.length()));
FlattenableUtils::write(buffer, size, mVendor.length()); FlattenableUtils::write(buffer, size, static_cast<uint32_t>(mVendor.length()));
memcpy(static_cast<char*>(buffer), mVendor.string(), mVendor.length()); memcpy(static_cast<char*>(buffer), mVendor.string(), mVendor.length());
FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(mVendor.length())); FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(mVendor.length()));
@ -156,9 +156,9 @@ status_t Sensor::flatten(void* buffer, size_t size) const {
} }
status_t Sensor::unflatten(void const* buffer, size_t size) { status_t Sensor::unflatten(void const* buffer, size_t size) {
size_t len; uint32_t len;
if (size < sizeof(size_t)) { if (size < sizeof(uint32_t)) {
return NO_MEMORY; return NO_MEMORY;
} }
FlattenableUtils::read(buffer, size, len); FlattenableUtils::read(buffer, size, len);
@ -169,7 +169,7 @@ status_t Sensor::unflatten(void const* buffer, size_t size) {
FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len)); FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
if (size < sizeof(size_t)) { if (size < sizeof(uint32_t)) {
return NO_MEMORY; return NO_MEMORY;
} }
FlattenableUtils::read(buffer, size, len); FlattenableUtils::read(buffer, size, len);
@ -179,7 +179,7 @@ status_t Sensor::unflatten(void const* buffer, size_t size) {
mVendor.setTo(static_cast<char const*>(buffer), len); mVendor.setTo(static_cast<char const*>(buffer), len);
FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len)); FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
size_t fixedSize = const size_t fixedSize =
sizeof(int32_t) * 3 + sizeof(int32_t) * 3 +
sizeof(float) * 4 + sizeof(float) * 4 +
sizeof(int32_t) * 3; sizeof(int32_t) * 3;