Bug 1455557: accept new line as RTCP FB NACK terminator. r=bwc
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Fri, 20 Apr 2018 21:52:16 -0700
changeset 468599 41ce4a9c69ddfc449baffa0b4722245c1752218b
parent 468598 63b01e47c7bb42f666ab8a68f376a0548d957987
child 468600 ee56d8ed0ea8deb5fd5bcf502780c71ebe42c8d1
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwc
bugs1455557
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1455557: accept new line as RTCP FB NACK terminator. r=bwc MozReview-Commit-ID: B0KaqRvLqNs
media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c
--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c
@@ -4674,17 +4674,17 @@ sdp_result_e sdp_parse_attr_rtcp_fb (sdp
 
         case SDP_RTCP_FB_NACK:
             /* Skip any remaining WS -- see
                http://code.google.com/p/webrtc/issues/detail?id=1922 */
             while (*ptr == ' ' || *ptr == '\t') {
                 ptr++;
             }
             /* Check for empty string */
-            if (*ptr == '\r') {
+            if (*ptr == '\r' || *ptr == '\n') {
                 rtcp_fb_p->param.nack = SDP_RTCP_FB_NACK_BASIC;
                 break;
             }
             i = find_token_enum("rtcp-fb nack type", sdp_p, &ptr,
                                 sdp_rtcp_fb_nack_type_val,
                                 SDP_MAX_RTCP_FB_NACK, SDP_RTCP_FB_NACK_UNKNOWN);
             if (i < 0) {
                 sdp_parse_error(sdp_p,