diff options
| author | Earl Ou <shunhsingou@google.com> | 2012-10-19 18:30:01 +0800 |
|---|---|---|
| committer | Earl Ou <shunhsingou@google.com> | 2012-10-31 14:49:04 +0800 |
| commit | c57d5a6b1e5e85c40d751b33dd868e29ccf4504e (patch) | |
| tree | 7d146d9ff99310e116d832625849844e6e144434 /gallerycommon/src/com/android/gallery3d/exif/ExifParser.java | |
| parent | 3f120e267f39712f0ae3c08557aa713faf45c210 (diff) | |
| download | android_packages_apps_Snap-c57d5a6b1e5e85c40d751b33dd868e29ccf4504e.tar.gz android_packages_apps_Snap-c57d5a6b1e5e85c40d751b33dd868e29ccf4504e.tar.bz2 android_packages_apps_Snap-c57d5a6b1e5e85c40d751b33dd868e29ccf4504e.zip | |
Handle invalid data type in ExifParser
Change-Id: I547021c03ec9e5d53c7452926c2ca5b6bf11dc43
Diffstat (limited to 'gallerycommon/src/com/android/gallery3d/exif/ExifParser.java')
| -rw-r--r-- | gallerycommon/src/com/android/gallery3d/exif/ExifParser.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java index 91fed9c76..b25cd2068 100644 --- a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java +++ b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java @@ -229,6 +229,9 @@ public class ExifParser { int endOfTags = mIfdStartOffset + OFFSET_SIZE + TAG_SIZE * mNumOfTagInIfd; if (offset < endOfTags) { mTag = readTag(); + if (mTag == null) { + return next(); + } if (mNeedToParseOffsetsInCurrentIfd) { checkOffsetOrImageTag(mTag); } @@ -305,8 +308,9 @@ public class ExifParser { if (mNeedToParseOffsetsInCurrentIfd) { while (offset < endOfTags) { mTag = readTag(); - checkOffsetOrImageTag(mTag); offset += TAG_SIZE; + if (mTag == null) continue; + checkOffsetOrImageTag(mTag); } } else { skipTo(endOfTags); @@ -470,6 +474,12 @@ public class ExifParser { throw new ExifInvalidFormatException( "Number of component is larger then Integer.MAX_VALUE"); } + // Some invalid image file contains invalid data type. Ignore those tags + if (!ExifTag.isValidType(dataFormat)) { + Log.w(TAG, String.format("Tag %04x: Invalid data type %d", tagId, dataFormat)); + mTiffStream.skip(4); + return null; + } ExifTag tag = new ExifTag(tagId, dataFormat, (int) numOfComp, mIfdType); int dataSize = tag.getDataSize(); if (dataSize > 4) { |