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
commitd7a9a6cffb4663c4ed28c4205367cf3c41191e36 (patch)
tree74084b56681820a14567f33b7821560d44483077
parent3ff33ee566475998767adff1f32e5aa42d27ea3c (diff)
downloadandroid_packages_apps_Snap-d7a9a6cffb4663c4ed28c4205367cf3c41191e36.tar.gz
android_packages_apps_Snap-d7a9a6cffb4663c4ed28c4205367cf3c41191e36.tar.bz2
android_packages_apps_Snap-d7a9a6cffb4663c4ed28c4205367cf3c41191e36.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) {