06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From: Jed Davis <jld@mozilla.com>
|
|
Date: Sun, 17 Nov 2019 03:40:00 +0000
|
|
Subject: Bug 1545504 - Strengthen bounds check in WebRTC PhysicalSocketServer.
|
|
r=jesup
|
|
|
|
PhysicalSocketServer isn't currently used by Mozilla's WebRTC
|
|
integration, but just in case, let's make sure that this array index is
|
|
bounds-checked in actual use, not just in debug builds (which tend to
|
|
never see realistic test conditions).
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D52745
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/2b079067648bfe0d064a334bf19bdcc233e26b6e
|
|
---
|
|
rtc_base/physical_socket_server.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/rtc_base/physical_socket_server.cc b/rtc_base/physical_socket_server.cc
|
|
index 2ec8936f4f..f3704ba053 100644
|
|
--- a/rtc_base/physical_socket_server.cc
|
|
+++ b/rtc_base/physical_socket_server.cc
|
|
@@ -1550,7 +1550,7 @@ bool PhysicalSocketServer::WaitSelect(int cmsWait, bool process_io) {
|
|
int fd = pdispatcher->GetDescriptor();
|
|
// "select"ing a file descriptor that is equal to or larger than
|
|
// FD_SETSIZE will result in undefined behavior.
|
|
- RTC_DCHECK_LT(fd, FD_SETSIZE);
|
|
+ RTC_CHECK_LT(fd, FD_SETSIZE);
|
|
if (fd > fdmax)
|
|
fdmax = fd;
|
|
|