diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp')
| -rw-r--r-- | Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp b/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp index 8d5b20f6a..0283b1348 100644 --- a/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp +++ b/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp @@ -54,7 +54,11 @@ void visibleTextQuads(const VisibleSelection& selection, Vector<FloatQuad>& quad { if (!selection.isRange()) return; - ASSERT(selection.firstRange()); + + // Make sure that both start and end have valid nodes associated otherwise + // this can crash. See PR 220628. + if (!selection.start().anchorNode() || !selection.end().anchorNode()) + return; visibleTextQuads(*(selection.firstRange()), quads, true /* useSelectionHeight */); } |