Changeset 18369 in webkit

Timestamp:

Dec 20, 2006 5:29:17 PM (17 years ago)

Author:

harrison

Message:

Reviewed by John Sullivan.

<rdar://problem/4893376> REGRESSION: Crash occurs at WebCoreFrameBridge fontForSelection: when drag selecting from a line break

No layout test added because crash only happens in path where editing window is key,
which is never the case for the automated tests.

• page/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge fontForSelection:]): Add nil check of fontForSelection() result.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-12-20  David Harrison  <harrison@apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/4893376> REGRESSION: Crash occurs at WebCoreFrameBridge fontForSelection: when drag selecting from a line break
+        
+        No layout test added because crash only happens in path where editing window is key,
+        which is never the case for the automated tests.
+
+        * page/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge fontForSelection:]):
+        Add nil check of fontForSelection() result.
+
 2006-12-21  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/page/mac/WebCoreFrameBridge.mm

@@ -1425 +1425 @@
     bool multipleFonts = false;
     NSFont *font = nil;
-    if (m_frame)
-        font = m_frame->editor()->fontForSelection(multipleFonts)->getNSFont();
+    if (m_frame) {
+        const FontData* fd = m_frame->editor()->fontForSelection(multipleFonts);
+        if (fd)
+            font = fd->getNSFont();
+    }
+    
     if (hasMultipleFonts)
         *hasMultipleFonts = multipleFonts;