commit 252f3b20bb158ddde6ffa687eff9c4d070919091
author Robert Shih <robertshih@google.com> Thu Mar 09 12:40:09 2017 -0800
committer Robert Shih <robertshih@google.com> Fri Mar 10 18:18:00 2017 +0000
tree 4ac0600f7c9c6d1fe2cfcca86039b38ad1ef55dc
parent 1f1416e51ae676af1a7f2a7a7151be12762b13d4

JNI ImageReader: propagate exceptions when creating surface planes

Bug: 36082388
Test: Manual
Change-Id: I4a0ad08c9b3c53aa7ca702e1c6e2d486b788f3ff

media/jni/android_media_ImageReader.cpp

diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index b00f5a5..f5e19f9 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -722,6 +722,9 @@
 
     LockedImage lockedImg = LockedImage();
     Image_getLockedImage(env, thiz, &lockedImg);
+    if (env->ExceptionCheck()) {
+        return NULL;
+    }
     // Create all SurfacePlanes
     for (int i = 0; i < numPlanes; i++) {
         Image_getLockedImageInfo(env, &lockedImg, i, halReaderFormat,