From d7a9a6cffb4663c4ed28c4205367cf3c41191e36 Mon Sep 17 00:00:00 2001
From: Earl Ou <shunhsingou@google.com>
Date: Wed, 1 Aug 2012 16:19:39 +0800
Subject: 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
---
 src/com/android/gallery3d/exif/IfdParser.java | 6 ++++--
 1 file 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) {
-- 
cgit v1.2.3