Skip to content

fmtp parser: checks parameterPair.length before accessing parameterPair[1] #2193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ public ImmutableMap<String, String> getFmtpParametersAsMap() {
for (String parameter : parameters) {
// The parameter values can bear equal signs, so splitAtFirst must be used.
String[] parameterPair = Util.splitAtFirst(parameter, "=");
formatParametersBuilder.put(parameterPair[0], parameterPair[1]);
if (parameterPair.length == 2) {
formatParametersBuilder.put(parameterPair[0].trim(), parameterPair[1].trim());
}
}
return formatParametersBuilder.buildOrThrow();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
package androidx.media3.exoplayer.rtsp;

import static androidx.media3.exoplayer.rtsp.MediaDescription.MEDIA_TYPE_VIDEO;
import static androidx.media3.exoplayer.rtsp.MediaDescription.RTP_AVP_PROFILE;
import static androidx.media3.exoplayer.rtsp.SessionDescription.ATTR_CONTROL;
import static androidx.media3.exoplayer.rtsp.SessionDescription.ATTR_FMTP;
import static androidx.media3.exoplayer.rtsp.SessionDescription.ATTR_RTPMAP;
import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableMap;
import org.junit.Test;

public class FmtpParserTest {

private MediaDescription createMediaDescription(String fmtpValue) {
return new MediaDescription.Builder(
MEDIA_TYPE_VIDEO, /* port= */ 0, RTP_AVP_PROFILE, /* payloadType= */ 96)
.addAttribute(ATTR_RTPMAP, "96 H264/90000")
.addAttribute(ATTR_FMTP, fmtpValue)
.build();
}

@Test
public void testValidFmtpParameters() {
MediaDescription mediaDescription = createMediaDescription(
"96 packetization-mode=1;profile-level-id=4D4028;sprop-parameter-sets=Z01AKJ2oHgCJ+WEAAAMAAQAAAwAehA==,aO48gA=="
);

ImmutableMap<String, String> fmtpMap = mediaDescription.getFmtpParametersAsMap();

assertThat(fmtpMap).containsExactly(
"packetization-mode", "1",
"profile-level-id", "4D4028",
"sprop-parameter-sets", "Z01AKJ2oHgCJ+WEAAAMAAQAAAwAehA==,aO48gA=="
);
}

@Test
public void testEmptyFmtpAttribute() {
try {
MediaDescription mediaDescription = createMediaDescription("");

ImmutableMap<String, String> fmtpMap = mediaDescription.getFmtpParametersAsMap();
} catch (Exception e) {
assertThat(e).isInstanceOf(IllegalArgumentException.class);
}
}

@Test
public void testNullFmtpAttribute() {
try {
MediaDescription mediaDescription = createMediaDescription(null);
ImmutableMap<String, String> fmtpMap = mediaDescription.getFmtpParametersAsMap();
assertThat(fmtpMap).isEmpty();
} catch (NullPointerException e) {
assertThat(e).isInstanceOf(NullPointerException.class);
}
}

@Test
public void testInvalidFormat_NoEqualSigns() {
MediaDescription mediaDescription = createMediaDescription("96 invalid-format");

ImmutableMap<String, String> fmtpMap = mediaDescription.getFmtpParametersAsMap();

assertThat(fmtpMap).isEmpty();
}

@Test
public void testTrailingSemicolon() {
MediaDescription mediaDescription = createMediaDescription(
"96 packetization-mode=1;profile-level-id=4D4028;");

ImmutableMap<String, String> fmtpMap = mediaDescription.getFmtpParametersAsMap();

assertThat(fmtpMap).containsExactly(
"packetization-mode", "1",
"profile-level-id", "4D4028"
);
}

@Test
public void testMultipleEqualsInValue() {
MediaDescription mediaDescription = createMediaDescription(
"96 complex-param=abc=xyz;another-param=value");

ImmutableMap<String, String> fmtpMap = mediaDescription.getFmtpParametersAsMap();

assertThat(fmtpMap).containsExactly(
"complex-param", "abc=xyz",
"another-param", "value"
);
}

@Test
public void testIncorrectFmtpFormat() {
// Modified input to have a space but still invalid
MediaDescription mediaDescription = createMediaDescription("96 profile-level-id");

ImmutableMap<String, String> fmtpMap = mediaDescription.getFmtpParametersAsMap();

assertThat(fmtpMap).isEmpty();
}
}