Changeset 65747 in webkit

Timestamp:

Aug 20, 2010 12:02:38 PM (14 years ago)

Author:

tony@chromium.org

Message:

2010-08-20 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] fix a null pointer crash when dispatching JS keyboard events
​https://bugs.webkit.org/show_bug.cgi?id=44313

• fast/events/initkeyboardevent-crash-expected.txt: Added.
• fast/events/initkeyboardevent-crash.html: Added.

2010-08-20 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] fix a null pointer crash when dispatching JS keyboard events
​https://bugs.webkit.org/show_bug.cgi?id=44313

• src/WebInputEventConversion.cpp: (WebKit::WebKeyboardEventBuilder::WebKeyboardEventBuilder):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/initkeyboardevent-crash-expected.txt (added)
• LayoutTests/fast/events/initkeyboardevent-crash.html (added)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebInputEventConversion.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-20  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] fix a null pointer crash when dispatching JS keyboard events
+        https://bugs.webkit.org/show_bug.cgi?id=44313
+
+        * fast/events/initkeyboardevent-crash-expected.txt: Added.
+        * fast/events/initkeyboardevent-crash.html: Added.
+
 2010-08-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-08-20  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] fix a null pointer crash when dispatching JS keyboard events
+        https://bugs.webkit.org/show_bug.cgi?id=44313
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::WebKeyboardEventBuilder::WebKeyboardEventBuilder):
+
 2010-08-20  Jay Civelli  <jcivelli@chromium.org>
 

trunk/WebKit/chromium/src/WebInputEventConversion.cpp

@@ -333 +333 @@
     timeStampSeconds = event.timeStamp() * 1.0e-3;
     windowsKeyCode = event.keyCode();
+
+    // The platform keyevent does not exist if the event was created using
+    // initKeyboardEvent.
+    if (!event.keyEvent())
+        return;
     nativeKeyCode = event.keyEvent()->nativeVirtualKeyCode();
     unsigned int numChars = std::min(event.keyEvent()->text().length(),