OSDN Git Service

am d5a354c6: am d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not...
authorArve Hjønnevåg <arve@android.com>
Thu, 20 Feb 2014 00:52:13 +0000 (00:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 00:52:13 +0000 (00:52 +0000)
* commit 'd5a354c6b7f2ae0b93e018f3024a2fca5f6543a1':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

1  2 
libs/binder/Parcel.cpp

@@@ -1338,9 -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;
+     size_t minOffset = 0;
      freeDataNoInit();
      mError = NO_ERROR;
      mData = const_cast<uint8_t*>(data);