From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sat, 7 Apr 2018 20:23:09 +0000 (+0100)
Subject: fix_selectedHtml_segfault
X-Git-Tag: archive/raspbian/5.212.0_alpha2-9+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8c28b98a1fb2acea806788a37cac0c76910bc3b5;p=qtwebkit-opensource-src.git

fix_selectedHtml_segfault


Gbp-Pq: Name fix_selectedHtml_segfault.diff
---

diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
index ab9fb138..6cf8df37 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
@@ -390,7 +390,10 @@ QString QWebPageAdapter::selectedText() const
 
 QString QWebPageAdapter::selectedHtml() const
 {
-    return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML();
+    RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange();
+    if (!range)
+        return QString();
+    return range->toHTML();
 }
 
 bool QWebPageAdapter::isContentEditable() const