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

Commit 55eda43a authored by Peter Eliasson's avatar Peter Eliasson Committed by Johan Redestig
Browse files

Cursor leakage due to cancellation signal 

If a query call was cancelled, the cursor adaptor might leak. The
adaptor is now closed if any exception is thrown during query.

Change-Id: Ic4c2edeaf2fcef56b4ef59484a36d3233aa12dbc
parent a11371f4

core/java/android/content/ContentProviderNative.java

+10 −3
Original line number Diff line number Diff line
@@ -112,17 +112,24 @@ abstract public class ContentProviderNative extends Binder implements IContentPr 
                    Cursor cursor = query(callingPkg, url, projection, selection, selectionArgs,

                            sortOrder, cancellationSignal);

                    if (cursor != null) {

                        CursorToBulkCursorAdaptor adaptor = null;



                        try {

                            CursorToBulkCursorAdaptor adaptor = new CursorToBulkCursorAdaptor(

                                    cursor, observer, getProviderName());

                            BulkCursorDescriptor d = adaptor.getBulkCursorDescriptor();

                            adaptor = new CursorToBulkCursorAdaptor(cursor, observer,

                                    getProviderName());

                            cursor = null;



                            BulkCursorDescriptor d = adaptor.getBulkCursorDescriptor();

                            adaptor = null;



                            reply.writeNoException();

                            reply.writeInt(1);

                            d.writeToParcel(reply, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);

                        } finally {

                            // Close cursor if an exception was thrown while constructing the adaptor.

                            if (adaptor != null) {

                                adaptor.close();

                            }

                            if (cursor != null) {

                                cursor.close();

                            }