d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-14 16:57:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix possible crash when adding a new RSS stream

Browse Source
This commit is contained in:
Christophe Dumez 2012-07-11 20:10:15 +03:00
parent cc192d7d47
commit c40801ce99
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rss/rss_imp.cpp
View File

@ -184,7 +184,7 @@ void RSSImp::on_newFeedButton_clicked() {
if (parent_item == m_feedList->stickyUnreadItem()) { if (parent_item == m_feedList->stickyUnreadItem()) {
parent_item = 0; parent_item = 0;
} else { } else {
if (m_feedList->isFolder(parent_item)) if (!m_feedList->isFolder(parent_item))
parent_item = parent_item->parent(); parent_item = parent_item->parent();
} }
} }

10
src/rss/rssfeed.cpp
View File

@ -258,15 +258,19 @@ bool RssFeed::parseRSS(QIODevice* device)
parseRSSChannel(xml); parseRSSChannel(xml);
found_channel = true; found_channel = true;
break; break;
} else } else {
qDebug() << "Skip rss item: " << xml.name();
xml.skipCurrentElement(); xml.skipCurrentElement();
}
} }
break; break;
} else } else {
qDebug() << "Skip root item: " << xml.name();
xml.skipCurrentElement(); xml.skipCurrentElement();
}
} }
if (xml.error()) { if (xml.hasError()) {
qWarning() << "Error parsing RSS document: " << xml.errorString(); qWarning() << "Error parsing RSS document: " << xml.errorString();
} }

3
src/rss/rssfolder.cpp
View File

@ -69,7 +69,10 @@ RssFolderPtr RssFolder::addFolder(const QString &name) {
} }
RssFeedPtr RssFolder::addStream(RssManager* manager, const QString &url) { RssFeedPtr RssFolder::addStream(RssManager* manager, const QString &url) {
qDebug() << Q_FUNC_INFO << manager << url;
RssFeedPtr stream(new RssFeed(manager, this, url)); RssFeedPtr stream(new RssFeed(manager, this, url));
Q_ASSERT(stream);
qDebug() << "Stream URL is " << stream->url();
Q_ASSERT(!m_children.contains(stream->url())); Q_ASSERT(!m_children.contains(stream->url()));
m_children[stream->url()] = stream; m_children[stream->url()] = stream;
stream->refresh(); stream->refresh();