From 59cf9aa283425a8206e6eb95f7d180db8c3f4bc9 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Thu, 19 Apr 2018 11:02:00 -0700
Subject: [PATCH] Guard against native crash due to null Surface

Bug: 77874529
Test: record video, mini CTS
Change-Id: I00815fa334a9701e344b263e62549655299013cf
---
 media/jni/android_media_MediaCodec.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 000317e688dab..16f6284b60314 100644
--- 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);