drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5462bc63: Fix a leak in Parcel::writeBlob.

Browse Source 
* commit '5462bc6318b4b70e7a58c66994e2bd79f59d9739':
  Fix a leak in Parcel::writeBlob.
This commit is contained in:
Jeff Brown
2011-11-05 02:35:57 +00:00
committed by Android Git Automerger
parent 2ccc47b898 5462bc6318
commit 88061d6b38
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/binder/Parcel.h
View File

@ -110,7 +110,8 @@ public:
// Place a file descriptor into the parcel. The given fd must remain // Place a file descriptor into the parcel. The given fd must remain
// valid for the lifetime of the parcel. // valid for the lifetime of the parcel.
status_t writeFileDescriptor(int fd); // The Parcel does not take ownership of the given fd unless you ask it to.
status_t writeFileDescriptor(int fd, bool takeOwnership = false);
// Place a file descriptor into the parcel. A dup of the fd is made, which // Place a file descriptor into the parcel. A dup of the fd is made, which
// will be closed once the parcel is destroyed. // will be closed once the parcel is destroyed.

13
libs/binder/Parcel.cpp
View File

@ -710,24 +710,19 @@ status_t Parcel::writeNativeHandle(const native_handle* handle)
return err; return err;
} }
status_t Parcel::writeFileDescriptor(int fd) status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership)
{ {
flat_binder_object obj; flat_binder_object obj;
obj.type = BINDER_TYPE_FD; obj.type = BINDER_TYPE_FD;
obj.flags = 0x7f | FLAT_BINDER_FLAG_ACCEPTS_FDS; obj.flags = 0x7f | FLAT_BINDER_FLAG_ACCEPTS_FDS;
obj.handle = fd; obj.handle = fd;
obj.cookie = (void*)0; obj.cookie = (void*) (takeOwnership ? 1 : 0);
return writeObject(obj, true); return writeObject(obj, true);
} }
status_t Parcel::writeDupFileDescriptor(int fd) status_t Parcel::writeDupFileDescriptor(int fd)
{ {
flat_binder_object obj; return writeFileDescriptor(dup(fd), true /*takeOwnership*/);
obj.type = BINDER_TYPE_FD;
obj.flags = 0x7f | FLAT_BINDER_FLAG_ACCEPTS_FDS;
obj.handle = dup(fd);
obj.cookie = (void*)1;
return writeObject(obj, true);
} }
status_t Parcel::writeBlob(size_t len, WritableBlob* outBlob) status_t Parcel::writeBlob(size_t len, WritableBlob* outBlob)
@ -764,7 +759,7 @@ status_t Parcel::writeBlob(size_t len, WritableBlob* outBlob)
} else { } else {
status = writeInt32(1); status = writeInt32(1);
if (!status) { if (!status) {
status = writeFileDescriptor(fd); status = writeFileDescriptor(fd, true /*takeOwnership*/);
if (!status) { if (!status) {
outBlob->init(true /*mapped*/, ptr, len); outBlob->init(true /*mapped*/, ptr, len);
return NO_ERROR; return NO_ERROR;