Title: [212924] trunk/Source/WebKit2
Revision
212924
Author
[email protected]
Date
2017-02-23 14:04:43 -0800 (Thu, 23 Feb 2017)

Log Message

ASSERT in RTCNetwork::IPAddress::decode()
https://bugs.webkit.org/show_bug.cgi?id=168792

Reviewed by Tim Horton.

An ASSERT added to RTCNetwork::IPAddress::decode in r212781 was hit due to a bad encode of SocketAddress; an
extra boolean value was added to the encoder unnecessarily, leading to garbage data being decoded in the following
IPAddress.

Drive-by-fix: allow the IPAddress encoder/decoder to pass through a value of AF_UNSPEC for an IPAddress to support
passing through an "empty" IPAddress value.

* Shared/RTCNetwork.cpp:
(WebKit::RTCNetwork::IPAddress::decode):
(WebKit::RTCNetwork::IPAddress::encode):
(WebKit::RTCNetwork::SocketAddress::encode):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (212923 => 212924)


--- trunk/Source/WebKit2/ChangeLog	2017-02-23 21:39:55 UTC (rev 212923)
+++ trunk/Source/WebKit2/ChangeLog	2017-02-23 22:04:43 UTC (rev 212924)
@@ -1,3 +1,22 @@
+2017-02-23  Jer Noble  <[email protected]>
+
+        ASSERT in RTCNetwork::IPAddress::decode()
+        https://bugs.webkit.org/show_bug.cgi?id=168792
+
+        Reviewed by Tim Horton.
+
+        An ASSERT added to RTCNetwork::IPAddress::decode in r212781 was hit due to a bad encode of SocketAddress; an
+        extra boolean value was added to the encoder unnecessarily, leading to garbage data being decoded in the following
+        IPAddress.
+
+        Drive-by-fix: allow the IPAddress encoder/decoder to pass through a value of AF_UNSPEC for an IPAddress to support
+        passing through an "empty" IPAddress value.
+
+        * Shared/RTCNetwork.cpp:
+        (WebKit::RTCNetwork::IPAddress::decode):
+        (WebKit::RTCNetwork::IPAddress::encode):
+        (WebKit::RTCNetwork::SocketAddress::encode):
+
 2017-02-23  Eric Carlson  <[email protected]>
 
         [WebRTC][Mac][WebKit2] WebRTC requires media capture

Modified: trunk/Source/WebKit2/Shared/RTCNetwork.cpp (212923 => 212924)


--- trunk/Source/WebKit2/Shared/RTCNetwork.cpp	2017-02-23 21:39:55 UTC (rev 212923)
+++ trunk/Source/WebKit2/Shared/RTCNetwork.cpp	2017-02-23 22:04:43 UTC (rev 212924)
@@ -66,8 +66,11 @@
     if (!decoder.decode(family))
         return false;
 
-    ASSERT(family == AF_INET || family == AF_INET6);
+    ASSERT(family == AF_INET || family == AF_INET6 || family == AF_UNSPEC);
 
+    if (family == AF_UNSPEC)
+        return true;
+
     IPC::DataReference data;
     if (!decoder.decode(data))
         return false;
@@ -88,9 +91,12 @@
 void RTCNetwork::IPAddress::encode(IPC::Encoder& encoder) const
 {
     auto family = value.family();
-    ASSERT(family == AF_INET || family == AF_INET6);
+    ASSERT(family == AF_INET || family == AF_INET6 || family == AF_UNSPEC);
     encoder << family;
 
+    if (family == AF_UNSPEC)
+        return;
+
     if (family == AF_INET) {
         auto address = value.ipv4_address();
         encoder << IPC::DataReference(reinterpret_cast<const uint8_t*>(&address), sizeof(address));
@@ -149,7 +155,6 @@
     auto hostname = value.hostname();
     encoder << IPC::DataReference(reinterpret_cast<const uint8_t*>(hostname.data()), hostname.length());
 
-    encoder << value.IsUnresolvedIP();
     if (value.IsUnresolvedIP()) {
         encoder << true;
         return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to