Title: [196919] releases/WebKitGTK/webkit-2.10/Source/WebKit2
Revision
196919
Author
[email protected]
Date
2016-02-22 02:03:07 -0800 (Mon, 22 Feb 2016)

Log Message

Merge r196307 - possible buffer overrun in Connection::processMessage of Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp
https://bugs.webkit.org/show_bug.cgi?id=153637

Patch by Fujii Hironori <[email protected]> on 2016-02-09
Reviewed by Carlos Garcia Campos.

* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::processMessage): Fix invalid arguments of memmove.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (196918 => 196919)


--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2016-02-22 09:31:43 UTC (rev 196918)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2016-02-22 10:03:07 UTC (rev 196919)
@@ -1,3 +1,13 @@
+2016-02-09  Fujii Hironori  <[email protected]>
+
+        possible buffer overrun in Connection::processMessage of Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=153637
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Platform/IPC/unix/ConnectionUnix.cpp:
+        (IPC::Connection::processMessage): Fix invalid arguments of memmove.
+
 2016-02-08  Carlos Garcia Campos  <[email protected]>
 
         Infinite loop when processing mouse events synchronously

Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (196918 => 196919)


--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp	2016-02-22 09:31:43 UTC (rev 196918)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp	2016-02-22 10:03:07 UTC (rev 196919)
@@ -255,9 +255,8 @@
 
     if (attachmentFileDescriptorCount) {
         if (m_fileDescriptorsSize > attachmentFileDescriptorCount) {
-            size_t fileDescriptorsLength = attachmentFileDescriptorCount * sizeof(int);
-            memmove(m_fileDescriptors.data(), m_fileDescriptors.data() + fileDescriptorsLength, m_fileDescriptorsSize - fileDescriptorsLength);
-            m_fileDescriptorsSize -= fileDescriptorsLength;
+            memmove(m_fileDescriptors.data(), m_fileDescriptors.data() + attachmentFileDescriptorCount, (m_fileDescriptorsSize - attachmentFileDescriptorCount) * sizeof(int));
+            m_fileDescriptorsSize -= attachmentFileDescriptorCount;
         } else
             m_fileDescriptorsSize = 0;
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to