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

am e59cb43e: Fix writeByteArray/writeInt32Array size on x64

Browse Source 
* commit 'e59cb43edad0eff28a81b18c3c4484442ff680dd':
  Fix writeByteArray/writeInt32Array size on x64
This commit is contained in:
Chad Brubaker 2015-06-30 22:59:12 +00:00 committed by Android Git Automerger
commit b5d6ec7cff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/binder/Parcel.cpp
View File

@ -735,9 +735,9 @@ status_t Parcel::writeInt32Array(size_t len, const int32_t *val) {
} }
if (!val) { if (!val) {
return writeAligned(-1); return writeInt32(-1);
} }
status_t ret = writeAligned(len); status_t ret = writeInt32(static_cast<uint32_t>(len));
if (ret == NO_ERROR) { if (ret == NO_ERROR) {
ret = write(val, len * sizeof(*val)); ret = write(val, len * sizeof(*val));
} }
@ -751,9 +751,9 @@ status_t Parcel::writeByteArray(size_t len, const uint8_t *val) {
} }
if (!val) { if (!val) {
return writeAligned(-1); return writeInt32(-1);
} }
status_t ret = writeAligned(len); status_t ret = writeInt32(static_cast<uint32_t>(len));
if (ret == NO_ERROR) { if (ret == NO_ERROR) {
ret = write(val, len * sizeof(*val)); ret = write(val, len * sizeof(*val));
} }