Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_utility.cc

Issue 1726573003: Fixed busy loop in case of partially malformed rtcp packet (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 _numberOfBlocks = header.count_or_format; 223 _numberOfBlocks = header.count_or_format;
224 ParseIJ(); 224 ParseIJ();
225 return; 225 return;
226 } 226 }
227 case PT_RTPFB: 227 case PT_RTPFB:
228 FALLTHROUGH(); 228 FALLTHROUGH();
229 case PT_PSFB: 229 case PT_PSFB:
230 { 230 {
231 if (!ParseFBCommon(header)) { 231 if (!ParseFBCommon(header)) {
232 // Nothing supported found, continue to next block! 232 // Nothing supported found, continue to next block!
233 EndCurrentBlock();
233 break; 234 break;
234 } 235 }
235 return; 236 return;
236 } 237 }
237 case PT_APP: 238 case PT_APP:
238 { 239 {
239 const bool ok = ParseAPP(header); 240 const bool ok = ParseAPP(header);
240 if (!ok) 241 if (!ok)
241 { 242 {
242 // Nothing supported found, continue to next block! 243 // Nothing supported found, continue to next block!
(...skipping 1459 matching lines...) Expand 10 before | Expand all | Expand 10 after
1702 const RTCPUtility::RtcpCommonHeader* 1703 const RTCPUtility::RtcpCommonHeader*
1703 RTCPUtility::RTCPPacketIterator::Current() { 1704 RTCPUtility::RTCPPacketIterator::Current() {
1704 if (!_ptrBlock) 1705 if (!_ptrBlock)
1705 { 1706 {
1706 return NULL; 1707 return NULL;
1707 } 1708 }
1708 1709
1709 return &_header; 1710 return &_header;
1710 } 1711 }
1711 } // namespace webrtc 1712 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698