commit 7d6eb9a4b49f2796017bc00e92eaea4eb0a3507a
author Mike Lockwood <lockwood@android.com> Mon Aug 24 18:12:51 2009 -0700
committer Mike Lockwood <lockwood@android.com> Mon Aug 24 18:12:51 2009 -0700
tree ea1de40258fc7166913a4da5a6cb83bfb65b353d
parent ec9fe4672a46eb928ab710d8e3caf2ce046100d4

ContactsContract: Fix null pointer exception in openContactPhotoInputStream()

Signed-off-by: Mike Lockwood <lockwood@android.com>

core/java/android/provider/ContactsContract.java

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 3a4449e..255534d 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -343,7 +343,7 @@
             Cursor cursor = cr.query(photoUri,
                     new String[]{ContactsContract.CommonDataKinds.Photo.PHOTO}, null, null, null);
             try {
-                if (!cursor.moveToNext()) {
+                if (cursor == null || !cursor.moveToNext()) {
                     return null;
                 }
                 byte[] data = cursor.getBlob(0);
@@ -352,7 +352,9 @@
                 }
                 return new ByteArrayInputStream(data);
             } finally {
-                cursor.close();
+                if (cursor != null) {
+                    cursor.close();
+                }
             }
         }
     }