commit 4358731c98929e2d5af70b0c4983a872386569bd
author Android (Google) Code Review <android-gerrit@google.com> Mon Aug 24 18:20:41 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 24 18:20:41 2009 -0700
tree aad8d354bb3a2ee0abd20780e68040fe52cd3700
parent 0badd0b700ed618dac421cb6cde4654b51acb3a4
parent 7d6eb9a4b49f2796017bc00e92eaea4eb0a3507a

Merge change 22534 into eclair

* changes:
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()

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();
+                }
             }
         }
     }