WebKit Bugzilla
Attachment 368287 Details for
Bug 197301
: Make sure sockets file descriptors are in the correct range
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-197301-20190425164023.patch (text/plain), 2.93 KB, created by
youenn fablet
on 2019-04-25 16:40:24 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
youenn fablet
Created:
2019-04-25 16:40:24 PDT
Size:
2.93 KB
patch
obsolete
>Subversion Revision: 244579 >diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog >index bd2fd5295530e19a36a02dbbbc4dab5f28e09780..1ba912bc529a977f779b76339b749a1f69a081d9 100644 >--- a/Source/ThirdParty/libwebrtc/ChangeLog >+++ b/Source/ThirdParty/libwebrtc/ChangeLog >@@ -1,3 +1,14 @@ >+2019-04-25 Youenn Fablet <youenn@apple.com> >+ >+ Make sure sockets file descriptors are in the correct range >+ https://bugs.webkit.org/show_bug.cgi?id=197301 >+ <rdar://problem/48389381> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Source/webrtc/rtc_base/physicalsocketserver.cc: >+ * WebKit/0001-fix-197301.patch: Added. >+ > 2019-04-23 Alex Christensen <achristensen@webkit.org> > > Add unit tests for WKWebView.serverTrust >diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc b/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc >index 7448a7e0427df2bbb7fbb28b21ee7664c69c4e03..91cb7da8366e2f1dfca360c57881f9707e54e008 100644 >--- a/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc >+++ b/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc >@@ -1424,6 +1424,8 @@ bool PhysicalSocketServer::WaitSelect(int cmsWait, bool process_io) { > // "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); >+ if (fd < 0 || fd >= FD_SETSIZE) >+ continue; > if (fd > fdmax) > fdmax = fd; > >diff --git a/Source/ThirdParty/libwebrtc/WebKit/0001-fix-197301.patch b/Source/ThirdParty/libwebrtc/WebKit/0001-fix-197301.patch >new file mode 100644 >index 0000000000000000000000000000000000000000..29af08b5ae7402c3099f23fdbd6481eddac6edc9 >--- /dev/null >+++ b/Source/ThirdParty/libwebrtc/WebKit/0001-fix-197301.patch >@@ -0,0 +1,25 @@ >+From cc826ae8baabae99a147d57ee2216e4cc4c2eaf6 Mon Sep 17 00:00:00 2001 >+From: Youenn Fablet <youenn@apple.com> >+Date: Thu, 25 Apr 2019 16:39:31 -0700 >+Subject: [PATCH] fix-197301 >+ >+--- >+ .../libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc | 2 ++ >+ 1 file changed, 2 insertions(+) >+ >+diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc b/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc >+index 7448a7e0427..91cb7da8366 100644 >+--- a/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc >++++ b/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/physicalsocketserver.cc >+@@ -1424,6 +1424,8 @@ bool PhysicalSocketServer::WaitSelect(int cmsWait, bool process_io) { >+ // "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); >++ if (fd < 0 || fd >= FD_SETSIZE) >++ continue; >+ if (fd > fdmax) >+ fdmax = fd; >+ >+-- >+2.20.1 (Apple Git-116) >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 197301
:
368285
| 368287