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

Robustness fix for malformed ID3 metadata

Browse Source 
Issue: #3116

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163693235
This commit is contained in:
olly 2017-07-31 07:53:08 -07:00 committed by Oliver Woodman
parent ecbcf09804
commit 2b5bd800e3
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
View File

@ -483,13 +483,8 @@ public final class Id3Decoder implements MetadataDecoder {
int ownerEndIndex = indexOfZeroByte(data, 0); int ownerEndIndex = indexOfZeroByte(data, 0);
String owner = new String(data, 0, ownerEndIndex, "ISO-8859-1"); String owner = new String(data, 0, ownerEndIndex, "ISO-8859-1");
byte[] privateData;
int privateDataStartIndex = ownerEndIndex + 1; int privateDataStartIndex = ownerEndIndex + 1;
if (privateDataStartIndex < data.length) { byte[] privateData = copyOfRangeIfValid(data, privateDataStartIndex, data.length);
privateData = Arrays.copyOfRange(data, privateDataStartIndex, data.length);
} else {
privateData = new byte[0];
}
return new PrivFrame(owner, privateData); return new PrivFrame(owner, privateData);
} }
@ -516,7 +511,7 @@ public final class Id3Decoder implements MetadataDecoder {
descriptionEndIndex - descriptionStartIndex, charset); descriptionEndIndex - descriptionStartIndex, charset);
int objectDataStartIndex = descriptionEndIndex + delimiterLength(encoding); int objectDataStartIndex = descriptionEndIndex + delimiterLength(encoding);
byte[] objectData = Arrays.copyOfRange(data, objectDataStartIndex, data.length); byte[] objectData = copyOfRangeIfValid(data, objectDataStartIndex, data.length);
return new GeobFrame(mimeType, filename, description, objectData); return new GeobFrame(mimeType, filename, description, objectData);
} }
@ -553,7 +548,7 @@ public final class Id3Decoder implements MetadataDecoder {
descriptionEndIndex - descriptionStartIndex, charset); descriptionEndIndex - descriptionStartIndex, charset);
int pictureDataStartIndex = descriptionEndIndex + delimiterLength(encoding); int pictureDataStartIndex = descriptionEndIndex + delimiterLength(encoding);
byte[] pictureData = Arrays.copyOfRange(data, pictureDataStartIndex, data.length); byte[] pictureData = copyOfRangeIfValid(data, pictureDataStartIndex, data.length);
return new ApicFrame(mimeType, description, pictureType, pictureData); return new ApicFrame(mimeType, description, pictureType, pictureData);
} }
@ -749,6 +744,22 @@ public final class Id3Decoder implements MetadataDecoder {
? 1 : 2; ? 1 : 2;
} }
/**
* Copies the specified range of an array, or returns a zero length array if the range is invalid.
*
* @param data The array from which to copy.
* @param from The start of the range to copy (inclusive).
* @param to The end of the range to copy (exclusive).
* @return The copied data, or a zero length array if the range is invalid.
*/
private static byte[] copyOfRangeIfValid(byte[] data, int from, int to) {
if (to <= from) {
// Invalid or zero length range.
return new byte[0];
}
return Arrays.copyOfRange(data, from, data.length);
}
private static final class Id3Header { private static final class Id3Header {
private final int majorVersion; private final int majorVersion;