[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konqueror] plugins/akregator: Akregator feed detector plugin: Do not crash for an invalid URL
From:       Jonathan Marten <null () kde ! org>
Date:       2018-04-30 14:54:19
Message-ID: E1fDAC3-0002s8-MC () code ! kde ! org
[Download RAW message or body]

Git commit e72de7f9d99804f4f13f80a6037eafa386a9d5c5 by Jonathan Marten.
Committed on 30/04/2018 at 09:11.
Pushed by marten into branch 'master'.

Akregator feed detector plugin: Do not crash for an invalid URL

Differential Revision: https://phabricator.kde.org/D12608

M  +6    -1    plugins/akregator/konqfeedicon.cpp

https://commits.kde.org/konqueror/e72de7f9d99804f4f13f80a6037eafa386a9d5c5

diff --git a/plugins/akregator/konqfeedicon.cpp b/plugins/akregator/konqfeedicon.cpp
index 375442def..ec5fe7421 100644
--- a/plugins/akregator/konqfeedicon.cpp
+++ b/plugins/akregator/konqfeedicon.cpp
@@ -101,9 +101,14 @@ KonqFeedIcon::~KonqFeedIcon()
 
 bool KonqFeedIcon::feedFound()
 {
+    // Ensure that it is safe to use the URL, before doing anything else with it
+    const KUrl partUrl(m_part->url());
+    if (!partUrl.isValid()) {
+        return false;
+    }
     // Since attempting to determine feed info for about:blank crashes khtml,
     // lets prevent such look up for local urls (about, file, man, etc...)
-    if (KProtocolInfo::protocolClass(m_part->url().scheme()).compare(QLatin1String(":local"), \
Qt::CaseInsensitive) == 0) { +    if \
(KProtocolInfo::protocolClass(partUrl.scheme()).compare(QLatin1String(":local"), \
Qt::CaseInsensitive) == 0) {  return false;
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]