| commit | 1e0d88b26a3605d4c620932f4bf9af54e37da376 | [log] [tgz] |
|---|---|---|
| author | Daniel Norman <danielnorman@google.com> | Tue Jan 07 15:02:54 2020 -0800 |
| committer | Daniel Norman <danielnorman@google.com> | Tue Jan 07 15:05:10 2020 -0800 |
| tree | a66dfdc7b8bb43301d7ba075e9599f61de0ec023 | |
| parent | 982ecd07f4da2f93704aa84a3b4f61fa79466b8b [diff] [blame] |
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
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 3388097..c1c4b55 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1798,7 +1798,9 @@ } void NuPlayer::closeAudioSink() { - mRenderer->closeAudioSink(); + if (mRenderer != NULL) { + mRenderer->closeAudioSink(); + } } void NuPlayer::restartAudio(