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

Commit e481771a authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Steve Kondik
Browse files

Parcel: file descriptor leak 

Resolve a file descriptor leak when a request for
ashmem size adjustment is not filed.

Change-Id: I4ebccfd096ec5313725fd99dc3e025f9561d061f
parent 0c5f3af3

libs/binder/Parcel.cpp

+3 −4
Original line number Diff line number Diff line
@@ -173,15 +173,14 @@ static void release_object(const sp<ProcessState>& proc, 
            return;

        }

        case BINDER_TYPE_FD: {

            if (obj.cookie != 0) { // owned

                if (outAshmemSize != NULL) {

                if (obj.cookie != 0) {

                    int size = ashmem_get_size_region(obj.handle);

                    if (size > 0) {

                        *outAshmemSize -= size;

                    }



                    close(obj.handle);

                }

            close(obj.handle);

#ifdef DISABLE_ASHMEM_TRACKING

            } else if (obj.cookie != 0) {

                close(obj.handle);