summaryrefslogtreecommitdiffstats
path: root/gallerycommon
diff options
context:
space:
mode:
authorqqzhou <qqzhou@codeaurora.org>2013-09-10 18:02:55 +0800
committeremancebo <emancebo@cyngn.com>2014-09-04 10:40:17 -0700
commitb292d11a72a4b4787df2e4d1c1a24760dbcbcf50 (patch)
tree90416bc27205ba2e7a3d0c825d6d10dc29c51dba /gallerycommon
parenta7cc2eed9ff1f7c205ea75383abb7ea89bf118ff (diff)
downloadandroid_packages_apps_Gallery2-b292d11a72a4b4787df2e4d1c1a24760dbcbcf50.tar.gz
android_packages_apps_Gallery2-b292d11a72a4b4787df2e4d1c1a24760dbcbcf50.tar.bz2
android_packages_apps_Gallery2-b292d11a72a4b4787df2e4d1c1a24760dbcbcf50.zip
Gallery2: fix issue in readTag when parse Exif
When read some Tag of jpeg images,the offset is less than the IFD0 offset position,then try to copy data above IFD0 as Tag value no matter whether data exists above IFD0,so null exception occurs in System.arraycopy.This issue can effect user in two aspects: 1.black thumbnail for some jpeg images in ALbumSetPage and ALbumPage. 2.force close happens when get details of some jpeg images. We set offset for this Tag not value on above situation. Change-Id: Icd368afcbed80556de0940e562dbcca42c53c849 CRs-Fixed: 525081
Diffstat (limited to 'gallerycommon')
-rw-r--r--gallerycommon/src/com/android/gallery3d/exif/ExifParser.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
index 5467d423d..5621c2339 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
@@ -556,7 +556,8 @@ class ExifParser {
}
// Some invalid images put some undefined data before IFD0.
// Read the data here.
- if ((offset < mIfd0Position) && (dataFormat == ExifTag.TYPE_UNDEFINED)) {
+ if ((offset < mIfd0Position) && (dataFormat == ExifTag.TYPE_UNDEFINED)
+ && (mIfd0Position > DEFAULT_IFD0_OFFSET)) {
byte[] buf = new byte[(int) numOfComp];
System.arraycopy(mDataAboveIfd0, (int) offset - DEFAULT_IFD0_OFFSET,
buf, 0, (int) numOfComp);