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

am: a98bb36fed Change-Id: I9cb3e75cdd72592250f755a575c138ecedd3a51b
2018-04-23 13:12:06 -07:00
parent c595c5c044 a98bb36fed
commit 34dd1000db
1 changed files with 5 additions and 0 deletions
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -1261,6 +1261,11 @@ static void android_media_MediaCodec_setInputSurface(
    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);