From 1e0d88b26a3605d4c620932f4bf9af54e37da376 Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com>
Date: Tue, 7 Jan 2020 15:02:54 -0800
Subject: [PATCH] Adds a null check in NuPlayer::closeAudioSink.

This was causing a null deref in cts/security/gce-all.

Bug: 142652210
Test: Run cts/security/gce-all, observe no more crash.
Change-Id: If2003b650f69e88825219113ce1b7d70edc4731d
---
 media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 33880975bc..c1c4b55400 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1798,7 +1798,9 @@ void NuPlayer::tryOpenAudioSinkForOffload(
 }
 
 void NuPlayer::closeAudioSink() {
-    mRenderer->closeAudioSink();
+    if (mRenderer != NULL) {
+        mRenderer->closeAudioSink();
+    }
 }
 
 void NuPlayer::restartAudio(