From 571f98f546d7c846ed672ff5250e47b43177c3d9 Mon Sep 17 00:00:00 2001
From: Danny Brain <me@danielbrain.com>
Date: Thu, 17 Aug 2017 21:30:46 +1000
Subject: [PATCH] Fix possible subrip timing line NPE

---
 .../google/android/exoplayer2/text/subrip/SubripDecoder.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index e76f0fd7e2..49ebe84d67 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -69,8 +69,8 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
       // Read and parse the timing line.
       boolean haveEndTimecode = false;
       currentLine = subripData.readLine();
-      Matcher matcher = SUBRIP_TIMING_LINE.matcher(currentLine);
-      if (matcher.matches()) {
+      Matcher matcher = currentLine == null ? null : SUBRIP_TIMING_LINE.matcher(currentLine);
+      if (matcher != null && matcher.matches()) {
         cueTimesUs.add(parseTimecode(matcher, 1));
         if (!TextUtils.isEmpty(matcher.group(6))) {
           haveEndTimecode = true;