From: Earl Ou <shunhsingou@google.com>
Date: Wed, 1 Aug 2012 08:19:39 +0000 (+0800)
Subject: Fix a bug in IfdParser
X-Git-Tag: android-x86-7.1-r1~1992^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0d5f1bb5b6b2c1d0c3d26c8cae1b322f29d4508d;p=android-x86%2Fpackages-apps-Gallery2.git

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
---

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) {