Changeset 92108 in webkit

Timestamp:

Aug 1, 2011 1:49:06 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Custom cursors cause the WebProcess to crash
​https://bugs.webkit.org/show_bug.cgi?id=64802

Patch by Amruth Raj <​amruthraj@motorola.com> on 2011-08-01
Reviewed by Darin Adler.

• Shared/WebCoreArgumentCoders.cpp:

(CoreIPC::::encode): In case of a NULL cursor image, encode a bool indicating that.
(CoreIPC::::decode): Decode the image only if required.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebCoreArgumentCoders.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-01  Amruth Raj  <amruthraj@motorola.com>
+
+        Custom cursors cause the WebProcess to crash
+        https://bugs.webkit.org/show_bug.cgi?id=64802
+
+        Reviewed by Darin Adler.
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (CoreIPC::::encode): In case of a NULL cursor image, encode a bool indicating that.
+        (CoreIPC::::decode): Decode the image only if required.
+
 2011-07-31  Daniel Bates  <dbates@webkit.org>
 

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -322 +322 @@
         return;
 
+    if (cursor.image()->isNull()) {
+        encoder->encodeBool(false); // There is no valid image being encoded.
+        return;
+    }
+
+    encoder->encodeBool(true);
     encodeImage(encoder, cursor.image());
     encoder->encode(cursor.hotSpot());
@@ -342 +348 @@
 
         cursor = cursorReference;
+        return true;
+    }
+
+    bool isValidImagePresent;
+    if (!decoder->decode(isValidImagePresent))
+        return false;
+
+    if (!isValidImagePresent) {
+        cursor = Cursor(Image::nullImage(), IntPoint());
         return true;
     }