From ae30fe496aa11e5af28625953c7048975a2ef884 Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 4 Jan 2017 06:59:38 -0800 Subject: [PATCH] Fix potential NPE if source is released without being prepared Issue: #2264 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=143550088 --- .../android/exoplayer2/source/hls/HlsMediaSource.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index 869efa6cdc..b7195cb79d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -94,8 +94,10 @@ public final class HlsMediaSource implements MediaSource, @Override public void releaseSource() { - playlistTracker.release(); - playlistTracker = null; + if (playlistTracker != null) { + playlistTracker.release(); + playlistTracker = null; + } sourceListener = null; }