Castopod
/
kasts
mirror of https://github.com/KDE/kasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More safeguards for getFeed and getEntry calls

This commit is contained in:
Bart De Vries 2023-06-18 16:31:42 +02:00
parent 67e3f5e990
commit 3eb66a510f
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/datamanager.cpp
View File

@ -127,31 +127,47 @@ DataManager::DataManager()
Feed *DataManager::getFeed(const int index) const Feed *DataManager::getFeed(const int index) const
{ {
return getFeed(m_feedmap[index]); if (index < m_feedmap.size()) {
return getFeed(m_feedmap[index]);
}
return nullptr;
} }
Feed *DataManager::getFeed(const QString &feedurl) const Feed *DataManager::getFeed(const QString &feedurl) const
{ {
if (m_feeds[feedurl] == nullptr) if (m_feeds.contains(feedurl)) {
loadFeed(feedurl); if (m_feeds[feedurl] == nullptr) {
return m_feeds[feedurl]; loadFeed(feedurl);
}
return m_feeds[feedurl];
}
return nullptr;
} }
Entry *DataManager::getEntry(const int feed_index, const int entry_index) const Entry *DataManager::getEntry(const int feed_index, const int entry_index) const
{ {
return getEntry(m_entrymap[m_feedmap[feed_index]][entry_index]); if (feed_index < m_feedmap.size() && entry_index < m_entrymap[m_feedmap[feed_index]].size()) {
return getEntry(m_entrymap[m_feedmap[feed_index]][entry_index]);
}
return nullptr;
} }
Entry *DataManager::getEntry(const Feed *feed, const int entry_index) const Entry *DataManager::getEntry(const Feed *feed, const int entry_index) const
{ {
return getEntry(m_entrymap[feed->url()][entry_index]); if (feed && entry_index < m_entrymap[feed->url()].size()) {
return getEntry(m_entrymap[feed->url()][entry_index]);
}
return nullptr;
} }
Entry *DataManager::getEntry(const QString &id) const Entry *DataManager::getEntry(const QString &id) const
{ {
if (m_entries[id] == nullptr) if (m_entries.contains(id)) {
loadEntry(id); if (m_entries[id] == nullptr)
return m_entries[id]; loadEntry(id);
return m_entries[id];
}
return nullptr;
} }
int DataManager::feedCount() const int DataManager::feedCount() const