summaryrefslogtreecommitdiffstats
path: root/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
diff options
context:
space:
mode:
authorEarl Ou <shunhsingou@google.com>2012-10-19 18:30:01 +0800
committerEarl Ou <shunhsingou@google.com>2012-10-31 14:49:04 +0800
commit74075d9b285446e2ae4ae1024653b96500b7dc68 (patch)
treec07fcff3f1404179efa68440f3a1a71c856ed11d /gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
parent2c07b4484013c715641ed66f926930ab228d2b18 (diff)
downloadandroid_packages_apps_Snap-74075d9b285446e2ae4ae1024653b96500b7dc68.tar.gz
android_packages_apps_Snap-74075d9b285446e2ae4ae1024653b96500b7dc68.tar.bz2
android_packages_apps_Snap-74075d9b285446e2ae4ae1024653b96500b7dc68.zip
Handle invalid data type in ExifParser
Change-Id: I547021c03ec9e5d53c7452926c2ca5b6bf11dc43
Diffstat (limited to 'gallerycommon/src/com/android/gallery3d/exif/ExifTag.java')
-rw-r--r--gallerycommon/src/com/android/gallery3d/exif/ExifTag.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
index 37b6d9fd0..157a8db3b 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
@@ -913,6 +913,13 @@ public class ExifTag {
IfdId.TYPE_IFD_INTEROPERABILITY);
}
+ static boolean isValidType(short type) {
+ return type == TYPE_UNSIGNED_BYTE || type == TYPE_ASCII ||
+ type == TYPE_UNSIGNED_SHORT || type == TYPE_UNSIGNED_LONG ||
+ type == TYPE_UNSIGNED_RATIONAL || type == TYPE_UNDEFINED ||
+ type == TYPE_LONG || type == TYPE_RATIONAL;
+ }
+
ExifTag(short tagId, short type, int componentCount, int ifd) {
mTagId = tagId;
mDataType = type;