diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-06-27 15:12:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-28 16:14:11 -0700 |
| commit | 399e6e41c6c65fbf0d5915309b6b6b344511b269 (patch) | |
| tree | 799963004e2953249d7474a6aceb07a2c25dc524 /src/com | |
| parent | 723944e1c1c6c1efe1ed1f141f498832d0ce8764 (diff) | |
| download | android_packages_apps_Gallery2-399e6e41c6c65fbf0d5915309b6b6b344511b269.tar.gz android_packages_apps_Gallery2-399e6e41c6c65fbf0d5915309b6b6b344511b269.tar.bz2 android_packages_apps_Gallery2-399e6e41c6c65fbf0d5915309b6b6b344511b269.zip | |
Gallery2: Fix for bug in mpo parsing
Fix bug in mpo parsing when reading from non-MPO image.
CRs-Fixed: 1029184
Change-Id: Id12c4f8b9ffcbc3584a00adb92c6216b2d1923ad
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/mpo/MpoParser.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/mpo/MpoParser.java b/src/com/android/gallery3d/mpo/MpoParser.java index f865ca061..b872db640 100644 --- a/src/com/android/gallery3d/mpo/MpoParser.java +++ b/src/com/android/gallery3d/mpo/MpoParser.java @@ -177,6 +177,11 @@ public class MpoParser { MpEntry mpEntry = null; byte[] data = null; + if(mMpEntries.size() < 2){ + // not enough entries were read. + return null; + } + if(primary) { if(mMpEntries.size() > 2) { mpEntry = mMpEntries.get(1); |