Commit e1a071b3 by claincly Committed by Oliver Woodman

Propagate duplicated keys error in SDP better.

The current code does not catch the IAE thrown when building a MediaDescription
or SessionDescription. This CL catches the IAE and propagates it as a
ParserException.

Issue: #9014.

PiperOrigin-RevId: 377544439
parent 64533c79
...@@ -186,7 +186,7 @@ import java.util.regex.Pattern; ...@@ -186,7 +186,7 @@ import java.util.regex.Pattern;
try { try {
return sessionDescriptionBuilder.build(); return sessionDescriptionBuilder.build();
} catch (IllegalStateException e) { } catch (IllegalArgumentException | IllegalStateException e) {
throw new ParserException(e); throw new ParserException(e);
} }
} }
...@@ -197,7 +197,7 @@ import java.util.regex.Pattern; ...@@ -197,7 +197,7 @@ import java.util.regex.Pattern;
throws ParserException { throws ParserException {
try { try {
sessionDescriptionBuilder.addMediaDescription(mediaDescriptionBuilder.build()); sessionDescriptionBuilder.addMediaDescription(mediaDescriptionBuilder.build());
} catch (IllegalStateException e) { } catch (IllegalArgumentException | IllegalStateException e) {
throw new ParserException(e); throw new ParserException(e);
} }
} }
......
...@@ -30,6 +30,7 @@ import static org.junit.Assert.assertThrows; ...@@ -30,6 +30,7 @@ import static org.junit.Assert.assertThrows;
import android.net.Uri; import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ParserException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -150,6 +151,35 @@ public class SessionDescriptionTest { ...@@ -150,6 +151,35 @@ public class SessionDescriptionTest {
} }
@Test @Test
public void parse_sdpStringWithDuplicatedMediaAttribute_throwsParserException() {
String testMediaSdpInfo =
"v=0\r\n"
+ "o=MNobody 2890844526 2890842807 IN IP4 192.0.2.46\r\n"
+ "s=SDP Seminar\r\n"
+ "i=A Seminar on the session description protocol\r\n"
+ "m=audio 3456 RTP/AVP 0\r\n"
+ "a=control:audio\r\n"
+ "a=control:audio\r\n";
assertThrows(ParserException.class, () -> SessionDescriptionParser.parse(testMediaSdpInfo));
}
@Test
public void parse_sdpStringWithDuplicatedSessionAttribute_throwsParserException() {
String testMediaSdpInfo =
"v=0\r\n"
+ "o=MNobody 2890844526 2890842807 IN IP4 192.0.2.46\r\n"
+ "s=SDP Seminar\r\n"
+ "a=control:*\r\n"
+ "a=control:*\r\n"
+ "i=A Seminar on the session description protocol\r\n"
+ "m=audio 3456 RTP/AVP 0\r\n"
+ "a=control:audio\r\n";
assertThrows(ParserException.class, () -> SessionDescriptionParser.parse(testMediaSdpInfo));
}
@Test
public void buildMediaDescription_withInvalidRtpmapAttribute_throwsIllegalStateException() { public void buildMediaDescription_withInvalidRtpmapAttribute_throwsIllegalStateException() {
assertThrows( assertThrows(
IllegalStateException.class, IllegalStateException.class,
......
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