From 83107cc25d402a5b405d67cdf4b3687d472d4f53 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 11 Oct 2016 07:20:44 -0700
Subject: [PATCH] Fix missing release calls on loadingPeriodHolder

playingPeriodHolder can be null in the case that the first
period is still being prepared. We need to make sure we
release the period that's being prepared in such cases,
which is loadingPeriodHolder.

Issue: #1914

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135793472
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 85f365e51e..56b862073a 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -538,16 +538,23 @@ import java.io.IOException;
       periodIndex = C.INDEX_UNSET;
     }
 
-    // Clear the timeline, but keep the requested period if it is already prepared.
-    MediaPeriodHolder<T> periodHolder = playingPeriodHolder;
     MediaPeriodHolder<T> newPlayingPeriodHolder = null;
-    while (periodHolder != null) {
-      if (periodHolder.index == periodIndex && periodHolder.prepared) {
-        newPlayingPeriodHolder = periodHolder;
-      } else {
-        periodHolder.release();
+    if (playingPeriodHolder == null) {
+      // We're still waiting for the first period to be prepared.
+      if (loadingPeriodHolder != null) {
+        loadingPeriodHolder.release();
+      }
+    } else {
+      // Clear the timeline, but keep the requested period if it is already prepared.
+      MediaPeriodHolder<T> periodHolder = playingPeriodHolder;
+      while (periodHolder != null) {
+        if (periodHolder.index == periodIndex && periodHolder.prepared) {
+          newPlayingPeriodHolder = periodHolder;
+        } else {
+          periodHolder.release();
+        }
+        periodHolder = periodHolder.next;
       }
-      periodHolder = periodHolder.next;
     }
 
     // Disable all the renderers if the period is changing.
@@ -892,7 +899,8 @@ import java.io.IOException;
     }
 
     // Release all loaded periods.
-    releasePeriodHoldersFrom(playingPeriodHolder);
+    releasePeriodHoldersFrom(playingPeriodHolder != null ? playingPeriodHolder
+        : loadingPeriodHolder);
     bufferAheadPeriodCount = 0;
     playingPeriodHolder = null;
     readingPeriodHolder = null;