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

Commit 713c258e authored by Steven Moreland's avatar Steven Moreland
Browse files

Binder: recycle Parcel in finally block 

If other types of exceptions happen here, we should still recycle the Parcel.

Bug: 207778694
Test: boot
Change-Id: I3375b87a674c45f8bc66848dfaf899497f5acaa8
parent 373b687d

core/java/android/os/Binder.java

+4 −3
Original line number Diff line number Diff line
@@ -1235,10 +1235,11 @@ public class Binder implements IBinder { 
                        data.readCallingWorkSourceUid());

                observer.callEnded(callSession, data.dataSize(), reply.dataSize(), workSourceUid);

            }

        }



            checkParcel(this, code, reply, "Unreasonably large binder reply buffer");

            reply.recycle();

            data.recycle();

        }



        // Just in case -- we are done with the IPC, so there should be no more strict

        // mode violations that have gathered for this thread. Either they have been