commit a98bb36fedb2e577f5ff83b6c1f2ac24ea082e80
author Marco Nelissen <marcone@google.com> Mon Apr 23 19:58:46 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 23 19:58:46 2018 +0000
tree e2fc1840225810a55c0bcde62c17736340d3b9b4
parent cef96f69d7b6bc2c435db0905ee37b3a48f1c865
parent 59cf9aa283425a8206e6eb95f7d180db8c3f4bc9

Merge "Guard against native crash due to null Surface" into pi-dev

media/jni/android_media_MediaCodec.cpp

diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 000317e..16f6284 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -1261,6 +1261,11 @@
     sp<PersistentSurface> persistentSurface =
         android_media_MediaCodec_getPersistentInputSurface(env, object);
 
+    if (persistentSurface == NULL) {
+        throwExceptionAsNecessary(
+                env, BAD_VALUE, ACTION_CODE_FATAL, "input surface not valid");
+        return;
+    }
     status_t err = codec->setInputSurface(persistentSurface);
     if (err != NO_ERROR) {
         throwExceptionAsNecessary(env, err);