From 116f57458ff9b26464a68cf5a61f04f19517aced Mon Sep 17 00:00:00 2001
From: Mattias Nilsson <mattias.nilsson@sonymobile.com>
Date: Thu, 27 Mar 2014 16:20:21 +0100
Subject: Avoid leaking cursors

Adding try/finally blocks to make sure that cursor
resources are let go

Change-Id: I596074aa9ab5752f91a26b5a03e1f39c23c64a5f
---
 .../providers/downloads/DownloadProvider.java      | 50 +++++++++++++---------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index ad3cf7ac..0928fdfc 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -1051,12 +1051,16 @@ public final class DownloadProvider extends ContentProvider {
             filteredValues = values;
             String filename = values.getAsString(Downloads.Impl._DATA);
             if (filename != null) {
-                Cursor c = query(uri, new String[]
-                        { Downloads.Impl.COLUMN_TITLE }, null, null, null);
-                if (!c.moveToFirst() || c.getString(0).isEmpty()) {
-                    values.put(Downloads.Impl.COLUMN_TITLE, new File(filename).getName());
+                Cursor c = null;
+                try {
+                    c = query(uri, new String[]
+                            { Downloads.Impl.COLUMN_TITLE }, null, null, null);
+                    if (!c.moveToFirst() || c.getString(0).isEmpty()) {
+                        values.put(Downloads.Impl.COLUMN_TITLE, new File(filename).getName());
+                    }
+                } finally {
+                    IoUtils.closeQuietly(c);
                 }
-                c.close();
             }
 
             Integer status = values.getAsInteger(Downloads.Impl.COLUMN_STATUS);
@@ -1275,29 +1279,35 @@ public final class DownloadProvider extends ContentProvider {
         if (cursor == null) {
             Log.v(Constants.TAG, "null cursor in openFile");
         } else {
-            if (!cursor.moveToFirst()) {
-                Log.v(Constants.TAG, "empty cursor in openFile");
-            } else {
-                do {
-                    Log.v(Constants.TAG, "row " + cursor.getInt(0) + " available");
-                } while(cursor.moveToNext());
+            try {
+                if (!cursor.moveToFirst()) {
+                    Log.v(Constants.TAG, "empty cursor in openFile");
+                } else {
+                    do {
+                        Log.v(Constants.TAG, "row " + cursor.getInt(0) + " available");
+                    } while(cursor.moveToNext());
+                }
+            } finally {
+                cursor.close();
             }
-            cursor.close();
         }
         cursor = query(uri, new String[] { "_data" }, null, null, null);
         if (cursor == null) {
             Log.v(Constants.TAG, "null cursor in openFile");
         } else {
-            if (!cursor.moveToFirst()) {
-                Log.v(Constants.TAG, "empty cursor in openFile");
-            } else {
-                String filename = cursor.getString(0);
-                Log.v(Constants.TAG, "filename in openFile: " + filename);
-                if (new java.io.File(filename).isFile()) {
-                    Log.v(Constants.TAG, "file exists in openFile");
+            try {
+                if (!cursor.moveToFirst()) {
+                    Log.v(Constants.TAG, "empty cursor in openFile");
+                } else {
+                    String filename = cursor.getString(0);
+                    Log.v(Constants.TAG, "filename in openFile: " + filename);
+                    if (new java.io.File(filename).isFile()) {
+                        Log.v(Constants.TAG, "file exists in openFile");
+                    }
                 }
+            } finally {
+                cursor.close();
             }
-            cursor.close();
         }
     }
 
-- 
cgit v1.2.3