Title: [109254] trunk/Source/WebKit/mac
Revision
109254
Author
enr...@apple.com
Date
2012-02-29 13:28:00 -0800 (Wed, 29 Feb 2012)

Log Message

Crash at -[WebFrame(WebInternal) _setTypingStyle:withUndoAction:]
https://bugs.webkit.org/show_bug.cgi?id=79937
<rdar://problem/10942936>

Reviewed by Dan Bernstein.

* WebView/WebFrame.mm:
(-[WebFrame _setTypingStyle:withUndoAction:]): Adding a null check.

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (109253 => 109254)


--- trunk/Source/WebKit/mac/ChangeLog	2012-02-29 21:27:19 UTC (rev 109253)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-02-29 21:28:00 UTC (rev 109254)
@@ -1,3 +1,14 @@
+2012-02-29  Enrica Casucci  <enr...@apple.com>
+
+        Crash at -[WebFrame(WebInternal) _setTypingStyle:withUndoAction:]
+        https://bugs.webkit.org/show_bug.cgi?id=79937
+        <rdar://problem/10942936>
+
+        Reviewed by Dan Bernstein.
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _setTypingStyle:withUndoAction:]): Adding a null check.
+
 2012-02-28  Simon Fraser  <simon.fra...@apple.com>
 
         Update WebKitSystemInterface.

Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (109253 => 109254)


--- trunk/Source/WebKit/mac/WebView/WebFrame.mm	2012-02-29 21:27:19 UTC (rev 109253)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm	2012-02-29 21:28:00 UTC (rev 109254)
@@ -797,7 +797,7 @@
 
 - (void)_setTypingStyle:(DOMCSSStyleDeclaration *)style withUndoAction:(EditAction)undoAction
 {
-    if (!_private->coreFrame)
+    if (!_private->coreFrame || !style)
         return;
     // FIXME: We shouldn't have to create a copy here.
     _private->coreFrame->editor()->computeAndSetTypingStyle(core(style)->copy().get(), undoAction);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to