Skip to content

SDK / exoplayer

Go to a project
Commit fc2e4ef4 by olly Committed by Oliver Woodman
Options

TS EsInfo: Be robust against a invalid descriptor length 

Issue: Issue: #7722
PiperOrigin-RevId: 325431839
parent 62829be1
Inline Side-by-side
Showing with 4 additions and 0 deletions
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
...@@ -657,6 +657,10 @@ public final class TsExtractor implements Extractor { ...@@ -657,6 +657,10 @@ public final class TsExtractor implements Extractor {
int descriptorTag = data.readUnsignedByte(); int descriptorTag = data.readUnsignedByte();
int descriptorLength = data.readUnsignedByte(); int descriptorLength = data.readUnsignedByte();
int positionOfNextDescriptor = data.getPosition() + descriptorLength; int positionOfNextDescriptor = data.getPosition() + descriptorLength;
if (positionOfNextDescriptor > descriptorsEndPosition) {
// Descriptor claims to extend past the end position. Skip it.
break;
}
if (descriptorTag == TS_PMT_DESC_REGISTRATION) { // registration_descriptor if (descriptorTag == TS_PMT_DESC_REGISTRATION) { // registration_descriptor
long formatIdentifier = data.readUnsignedInt(); long formatIdentifier = data.readUnsignedInt();
if (formatIdentifier == AC3_FORMAT_IDENTIFIER) { if (formatIdentifier == AC3_FORMAT_IDENTIFIER) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment