am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.
* commit '88061d6b38cfb4bf374039846b753a3b21ac61e1': Fix a leak in Parcel::writeBlob.
This commit is contained in:
commit
c17f56fdf1
@ -110,7 +110,8 @@ public:
|
||||
|
||||
// Place a file descriptor into the parcel. The given fd must remain
|
||||
// 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
|
||||
// will be closed once the parcel is destroyed.
|
||||
|
@ -710,24 +710,19 @@ status_t Parcel::writeNativeHandle(const native_handle* handle)
|
||||
return err;
|
||||
}
|
||||
|
||||
status_t Parcel::writeFileDescriptor(int fd)
|
||||
status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership)
|
||||
{
|
||||
flat_binder_object obj;
|
||||
obj.type = BINDER_TYPE_FD;
|
||||
obj.flags = 0x7f | FLAT_BINDER_FLAG_ACCEPTS_FDS;
|
||||
obj.handle = fd;
|
||||
obj.cookie = (void*)0;
|
||||
obj.cookie = (void*) (takeOwnership ? 1 : 0);
|
||||
return writeObject(obj, true);
|
||||
}
|
||||
|
||||
status_t Parcel::writeDupFileDescriptor(int fd)
|
||||
{
|
||||
flat_binder_object obj;
|
||||
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);
|
||||
return writeFileDescriptor(dup(fd), true /*takeOwnership*/);
|
||||
}
|
||||
|
||||
status_t Parcel::writeBlob(size_t len, WritableBlob* outBlob)
|
||||
@ -764,7 +759,7 @@ status_t Parcel::writeBlob(size_t len, WritableBlob* outBlob)
|
||||
} else {
|
||||
status = writeInt32(1);
|
||||
if (!status) {
|
||||
status = writeFileDescriptor(fd);
|
||||
status = writeFileDescriptor(fd, true /*takeOwnership*/);
|
||||
if (!status) {
|
||||
outBlob->init(true /*mapped*/, ptr, len);
|
||||
return NO_ERROR;
|
||||
|
Loading…
Reference in New Issue
Block a user