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

am 98e67d35: Don\'t corrupt parcel when writeFileDescriptor() fails

Browse Source 
* commit '98e67d352b8805a868ca0e7c2be3ea830fb7c338':
  Don't corrupt parcel when writeFileDescriptor() fails
This commit is contained in:
Christopher Tate 2015-06-08 21:32:58 +00:00 committed by Android Git Automerger
commit aeac647a00
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/binder/Parcel.cpp
View File

@ -1013,6 +1013,15 @@ status_t Parcel::writeObject(const flat_binder_object& val, bool nullMetaData)
restart_write: restart_write:
*reinterpret_cast<flat_binder_object*>(mData+mDataPos) = val; *reinterpret_cast<flat_binder_object*>(mData+mDataPos) = val;
// remember if it's a file descriptor
if (val.type == BINDER_TYPE_FD) {
if (!mAllowFds) {
// fail before modifying our object index
return FDS_NOT_ALLOWED;
}
mHasFds = mFdsKnown = true;
}
// Need to write meta-data? // Need to write meta-data?
if (nullMetaData || val.binder != 0) { if (nullMetaData || val.binder != 0) {
mObjects[mObjectsSize] = mDataPos; mObjects[mObjectsSize] = mDataPos;
@ -1020,14 +1029,6 @@ restart_write:
mObjectsSize++; mObjectsSize++;
} }
// remember if it's a file descriptor
if (val.type == BINDER_TYPE_FD) {
if (!mAllowFds) {
return FDS_NOT_ALLOWED;
}
mHasFds = mFdsKnown = true;
}
return finishWrite(sizeof(flat_binder_object)); return finishWrite(sizeof(flat_binder_object));
} }