Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e22d8ef5 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix possible leak in Parcel::writeDupFileDescriptor."

parents 9f4ac1a0 d341c717

libs/binder/Parcel.cpp

+9 −1
Original line number Diff line number Diff line
@@ -722,7 +722,15 @@ status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership) 


status_t Parcel::writeDupFileDescriptor(int fd)

{

    return writeFileDescriptor(dup(fd), true /*takeOwnership*/);

    int dupFd = dup(fd);

    if (dupFd < 0) {

        return -errno;

    }

    status_t err = writeFileDescriptor(dupFd, true /*takeOwnership*/);

    if (err) {

        close(dupFd);

    }

    return err;

}



status_t Parcel::writeBlob(size_t len, WritableBlob* outBlob)