content/browser/renderer_host/p2p/socket_host.cc - Issue 373873002: Fixes for re-enabling more MSVC level 4 warnings: content/browser/ edition

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/p2p/socket_host.cc

Issue 373873002: Fixes for re-enabling more MSVC level 4 warnings: content/browser/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc ('k') | content/browser/service_worker/service_worker_internals_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/p2p/socket_host.cc

diff --git a/content/browser/renderer_host/p2p/socket_host.cc b/content/browser/renderer_host/p2p/socket_host.cc

index 007ab77a2004d5e6bff632c18f7d7302486aec5d..5fc38184f819a77ba1bca54ada114b4e7c5b13bd 100644

--- a/content/browser/renderer_host/p2p/socket_host.cc

+++ b/content/browser/renderer_host/p2p/socket_host.cc

@@ -221,7 +221,8 @@ bool GetRtpPacketStartPositionAndLength(const char* packet,

int length,

int* rtp_start_pos,

int* rtp_packet_length) {

- int rtp_begin, rtp_length;

+ int rtp_begin;

+ int rtp_length = 0;

if (IsTurnChannelData(packet)) {

// Turn Channel Message header format.

// 0 1 2 3

@@ -314,7 +315,7 @@ bool GetRtpPacketStartPositionAndLength(const char* packet,

}

// Making sure we have a valid RTP packet at the end.

- if (!(rtp_length < kMinRtpHdrLen) &&

+ if ((rtp_length >= kMinRtpHdrLen) &&

IsRtpPacket(packet + rtp_begin, rtp_length) &&

ValidateRtpHeader(packet + rtp_begin, rtp_length, NULL)) {

*rtp_start_pos = rtp_begin;