OSDN Git Service

am e45636a8: am d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap
authorArve Hjønnevåg <arve@android.com>
Wed, 19 Feb 2014 21:50:15 +0000 (21:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Feb 2014 21:50:15 +0000 (21:50 +0000)
* commit 'e45636a8674b9cbb9305648e21316210e1daf920':
  Binder: Make sure binder objects do not overlap

1  2 
libs/binder/Parcel.cpp

@@@ -1337,8 -1316,9 +1338,9 @@@ size_t Parcel::ipcObjectsCount() cons
  }
  
  void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize,
 -    const size_t* objects, size_t objectsCount, release_func relFunc, void* relCookie)
 +    const binder_size_t* objects, size_t objectsCount, release_func relFunc, void* relCookie)
  {
+     binder_size_t minOffset = 0;
      freeDataNoInit();
      mError = NO_ERROR;
      mData = const_cast<uint8_t*>(data);