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

Commit b6333b34 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 2351 into donut

* changes:
  Fix a major bug in Bundle when unparcelling from AIDL.
parents 3f256f34 8af0f82d
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -409,12 +409,16 @@ status_t Parcel::appendFrom(Parcel *parcel, size_t offset, size_t len)
            mObjects[idx++] = off;
            mObjectsSize++;

            const flat_binder_object* flat
            flat_binder_object* flat
                = reinterpret_cast<flat_binder_object*>(mData + off);
            acquire_object(proc, *flat, this);

            // take note if the object is a file descriptor
            if (flat->type == BINDER_TYPE_FD) {
                // If this is a file descriptor, we need to dup it so the
                // new Parcel now owns its own fd, and can declare that we
                // officially know we have fds.
                flat->handle = dup(flat->handle);
                flat->cookie = (void*)1;
                mHasFds = mFdsKnown = true;
            }
        }