loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-12 01:59:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make SsaDecoder more robust against malformed content

Browse Source 
Issue: #3645

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=180559196
This commit is contained in:
olly 2018-01-02 10:07:15 -08:00 committed by Oliver Woodman
parent ad95a147d2
commit f657893973
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
View File

@ -150,6 +150,12 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
break; break;
} }
} }
if (formatStartIndex == C.INDEX_UNSET
|| formatEndIndex == C.INDEX_UNSET
|| formatTextIndex == C.INDEX_UNSET) {
// Set to 0 so that parseDialogueLine skips lines until a complete format line is found.
formatKeyCount = 0;
}
} }
/** /**
@ -161,12 +167,17 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
*/ */
private void parseDialogueLine(String dialogueLine, List<Cue> cues, LongArray cueTimesUs) { private void parseDialogueLine(String dialogueLine, List<Cue> cues, LongArray cueTimesUs) {
if (formatKeyCount == 0) { if (formatKeyCount == 0) {
Log.w(TAG, "Skipping dialogue line before format: " + dialogueLine); Log.w(TAG, "Skipping dialogue line before complete format: " + dialogueLine);
return; return;
} }
String[] lineValues = dialogueLine.substring(DIALOGUE_LINE_PREFIX.length()) String[] lineValues = dialogueLine.substring(DIALOGUE_LINE_PREFIX.length())
.split(",", formatKeyCount); .split(",", formatKeyCount);
if (lineValues.length != formatKeyCount) {
Log.w(TAG, "Skipping dialogue line with fewer columns than format: " + dialogueLine);
return;
}
long startTimeUs = SsaDecoder.parseTimecodeUs(lineValues[formatStartIndex]); long startTimeUs = SsaDecoder.parseTimecodeUs(lineValues[formatStartIndex]);
if (startTimeUs == C.TIME_UNSET) { if (startTimeUs == C.TIME_UNSET) {
Log.w(TAG, "Skipping invalid timing: " + dialogueLine); Log.w(TAG, "Skipping invalid timing: " + dialogueLine);