diff options
| author | Earl Ou <shunhsingou@google.com> | 2012-08-01 02:21:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-01 02:21:05 -0700 |
| commit | 7fbdc58ae8938ea77655e97fdc2235a097d61c7f (patch) | |
| tree | 35b7453c079887478efca641a0a553a2299eb491 | |
| parent | 29446731c8cfa6e0456fe8b39fc3ce21c69207a6 (diff) | |
| parent | d7a9a6cffb4663c4ed28c4205367cf3c41191e36 (diff) | |
| download | android_packages_apps_Snap-7fbdc58ae8938ea77655e97fdc2235a097d61c7f.tar.gz android_packages_apps_Snap-7fbdc58ae8938ea77655e97fdc2235a097d61c7f.tar.bz2 android_packages_apps_Snap-7fbdc58ae8938ea77655e97fdc2235a097d61c7f.zip | |
Merge "Fix a bug in IfdParser" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/exif/IfdParser.java | 6 |
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) { |