Changeset 169037 in webkit

Timestamp:

May 18, 2014, 10:50:30 PM (12 years ago)

Author:

Brent Fulgham

Message:

Crash during scroll when latched
​https://bugs.webkit.org/show_bug.cgi?id=133064

Reviewed by Simon Fraser.

• page/mac/EventHandlerMac.mm:

(WebCore::EventHandler::platformPrepareForWheelEvents): Prevent dereference of NULL
wheelEventTarget argument.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/EventHandlerMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-18  Brent Fulgham  <bfulgham@apple.com>
+
+        Crash during scroll when latched
+        https://bugs.webkit.org/show_bug.cgi?id=133064
+
+        Reviewed by Simon Fraser.
+
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::platformPrepareForWheelEvents): Prevent dereference of NULL
+        wheelEventTarget argument.
+
 2014-05-18  Svetlana Redchenko  <redchenko@yandex-team.ru>
 

trunk/Source/WebCore/page/mac/EventHandlerMac.mm

@@ -805 +805 @@
     
     if (wheelEvent.shouldConsiderLatching()) {
-        if (scrollableArea)
+        if (scrollableArea && scrollableContainer)
             m_startedGestureAtScrollLimit = scrolledToEdgeInDominantDirection(*scrollableContainer, *scrollableArea, wheelEvent.deltaX(), wheelEvent.deltaY());
         else