From 399e6e41c6c65fbf0d5915309b6b6b344511b269 Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Mon, 27 Jun 2016 15:12:57 -0700
Subject: Gallery2: Fix for bug in mpo parsing

Fix bug in mpo parsing when reading from non-MPO image.

CRs-Fixed: 1029184
Change-Id: Id12c4f8b9ffcbc3584a00adb92c6216b2d1923ad
---
 src/com/android/gallery3d/mpo/MpoParser.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

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);
-- 
cgit v1.2.3