commit 12771a19103b8d8f037f67f41299a8256881764d
author deadbeef <deadbeef@webrtc.org> Tue Jan 03 13:53:47 2017 -0800
committer Commit bot <commit-bot@chromium.org> Tue Jan 03 21:53:47 2017 +0000
tree c40017bcb2d7e032e45250d247a0b2b0815b0ec8
parent 7be1987b755813d0ec961d24067be21007bc6f14

Relax parsing of a=bundle-only with a nonzero port.

This use of a=bundle-only is unspecified, but not disallowed, so it
should simply result in the attribute being ignored, not a parse
failure.

Note that older versions of Firefox may generate SDP with a=bundle-only
and a nonzero port, so this also fixes an interop issue. See:
https://bugzilla.mozilla.org/show_bug.cgi?id=1325991

BUG=webrtc:4674

Review-Url: https://codereview.webrtc.org/2609863003
Cr-Commit-Position: refs/heads/master@{#15890}

webrtc/api/webrtcsdp.cc

diff --git a/webrtc/api/webrtcsdp.cc b/webrtc/api/webrtcsdp.cc
index f18653d..e5ee416 100644
--- a/webrtc/api/webrtcsdp.cc
+++ b/webrtc/api/webrtcsdp.cc
@@ -2372,14 +2372,17 @@
     }
 
     bool content_rejected = false;
+    // A port of 0 is not interpreted as a rejected m= section when it's
+    // used along with a=bundle-only.
     if (bundle_only) {
-      // A port of 0 is not interpreted as a rejected m= section when it's
-      // used along with a=bundle-only.
       if (!port_rejected) {
-        return ParseFailed(
-            "a=bundle-only",
-            "a=bundle-only MUST only be used in combination with a 0 port.",
-            error);
+        // Usage of bundle-only with a nonzero port is unspecified. So just
+        // ignore bundle-only if we see this.
+        bundle_only = false;
+        LOG(LS_WARNING)
+            << "a=bundle-only attribute observed with a nonzero "
+            << "port; this usage is unspecified so the attribute is being "
+            << "ignored.";
       }
     } else {
       // If not using bundle-only, interpret port 0 in the normal way; the m=