From 6e18ee7502a3d47231cb5a134b03f0da318b2e67 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sun, 6 Apr 2014 15:13:07 +0200 Subject: [PATCH] [PageFormCompleter] Try to be extra cautious with QWebFrames This is an attempt to fix crash when calling QWebFrame::childFrames in PageFormCompleter::getAllElementsFromPage [ci skip] --- src/lib/autofill/pageformcompleter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/autofill/pageformcompleter.cpp b/src/lib/autofill/pageformcompleter.cpp index cf8e3a034..0e0670c72 100644 --- a/src/lib/autofill/pageformcompleter.cpp +++ b/src/lib/autofill/pageformcompleter.cpp @@ -233,15 +233,15 @@ QWebElementCollection PageFormCompleter::getAllElementsFromPage(const QString &s { QWebElementCollection list; - if (!m_page) { + if (!m_page || !m_page->mainFrame()) return list; - } QList frames; frames.append(m_page->mainFrame()); + while (!frames.isEmpty()) { QWebFrame* frame = frames.takeFirst(); - if (frame) { + if (frame && !frame->documentElement().isNull()) { list.append(frame->findAllElements(selector)); frames += frame->childFrames(); }