summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Ou <shunhsingou@google.com>2012-08-01 16:19:39 +0800
committerEarl Ou <shunhsingou@google.com>2012-08-01 16:19:39 +0800
commit0d5f1bb5b6b2c1d0c3d26c8cae1b322f29d4508d (patch)
treed265ecdc060a8c2df124151094f40cf9a8c4138f
parentc130eed3ac25a20a981d811796076177f1628f92 (diff)
downloadandroid_packages_apps_Gallery2-0d5f1bb5b6b2c1d0c3d26c8cae1b322f29d4508d.tar.gz
android_packages_apps_Gallery2-0d5f1bb5b6b2c1d0c3d26c8cae1b322f29d4508d.tar.bz2
android_packages_apps_Gallery2-0d5f1bb5b6b2c1d0c3d26c8cae1b322f29d4508d.zip
Fix a bug in IfdParser
Originally if we call next after the last tag without read the value, we will receive a wrong tag. Change-Id: Ib154d112a568c593270ee6676d4954a7c26567f2
-rw-r--r--src/com/android/gallery3d/exif/IfdParser.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/exif/IfdParser.java b/src/com/android/gallery3d/exif/IfdParser.java
index 6af10c732..6638dafcb 100644
--- a/src/com/android/gallery3d/exif/IfdParser.java
+++ b/src/com/android/gallery3d/exif/IfdParser.java
@@ -64,8 +64,10 @@ public class IfdParser {
if (offset < mEndOfTagOffset) {
skipTo(mNextOffset);
- mNextOffset += TAG_SIZE;
- return TYPE_NEW_TAG;
+ if(mNextOffset < mEndOfTagOffset) {
+ mNextOffset += TAG_SIZE;
+ return TYPE_NEW_TAG;
+ }
}
if (offset == mEndOfTagOffset) {