loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3185 from dbrain/subrip_timing_line_crash

Browse Source 
Fix possible subrip timing line NPE
This commit is contained in:
ojw28 2017-08-17 23:09:50 +01:00 committed by GitHub
commit 7ddcc46cbd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
View File

@ -69,8 +69,8 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
// Read and parse the timing line. // Read and parse the timing line.
boolean haveEndTimecode = false; boolean haveEndTimecode = false;
currentLine = subripData.readLine(); currentLine = subripData.readLine();
Matcher matcher = SUBRIP_TIMING_LINE.matcher(currentLine); Matcher matcher = currentLine == null ? null : SUBRIP_TIMING_LINE.matcher(currentLine);
if (matcher.matches()) { if (matcher != null && matcher.matches()) {
cueTimesUs.add(parseTimecode(matcher, 1)); cueTimesUs.add(parseTimecode(matcher, 1));
if (!TextUtils.isEmpty(matcher.group(6))) { if (!TextUtils.isEmpty(matcher.group(6))) {
haveEndTimecode = true; haveEndTimecode = true;