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

Commit 853702ce authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c 

am: 275c9f60

* commit '275c9f60':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I6516dea7eac82d06e1ffd1d269dbb6415fece948
parents 74d2c4b4 275c9f60

libs/binder/Parcel.cpp

+7 −1
Original line number Diff line number Diff line
@@ -1150,7 +1150,13 @@ native_handle* Parcel::readNativeHandle() const 


    for (int i=0 ; err==NO_ERROR && i<numFds ; i++) {

        h->data[i] = dup(readFileDescriptor());

        if (h->data[i] < 0) err = BAD_VALUE;

        if (h->data[i] < 0) {

            for (int j = 0; j < i; j++) {

                close(h->data[j]);

            }

            native_handle_delete(h);

            return 0;

        }

    }

    err = read(h->data + numFds, sizeof(int)*numInts);

    if (err != NO_ERROR) {