Check that the exif bits are actually there

b/12663599

Change-Id: If2af0ab20f29ab3264a8c6c8c4abf0ebeff6616c

1 files changed, 2 insertions, 2 deletions

diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp
index 4fbc55a3fa87..6b0bd0d9f8b7 100644
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -823,8 +823,8 @@ MtpResponseCode MyMtpDatabase::getObjectInfo(MtpObjectHandle handle,
                     exifdata->ifd[EXIF_IFD_EXIF], EXIF_TAG_PIXEL_Y_DIMENSION);
             info.mThumbCompressedSize = exifdata->data ? exifdata->size : 0;
             info.mThumbFormat = MTP_FORMAT_EXIF_JPEG;
-            info.mImagePixWidth = getLongFromExifEntry(w);
-            info.mImagePixHeight = getLongFromExifEntry(h);
+            info.mImagePixWidth = w ? getLongFromExifEntry(w) : 0;
+            info.mImagePixHeight = h ? getLongFromExifEntry(h) : 0;
             exif_data_unref(exifdata);
         }
     }