Skip to content

Commit 1d77cf5

Browse files
author
elupus
committed
fixed: make sure we validate CAddonMgr::GetDefaults return value
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28613 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
1 parent 574169e commit 1d77cf5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

xbmc/GUIDialogContentSettings.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,7 @@ void CGUIDialogContentSettings::FillContentTypes(const CONTENT_TYPE &content)
250250

251251
AddonPtr addon;
252252
CStdString defaultID;
253-
CAddonMgr::Get()->GetDefault(ADDON_SCRAPER, addon, content);
254-
if (addon)
253+
if (CAddonMgr::Get()->GetDefault(ADDON_SCRAPER, addon, content))
255254
defaultID = addon->ID();
256255

257256
for (IVECADDONS it = addons.begin(); it != addons.end(); it++)

xbmc/GUIWindowVisualisation.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ bool CGUIWindowVisualisation::OnMessage(CGUIMessage& message)
176176
}
177177

178178
AddonPtr viz;
179-
CAddonMgr::Get()->GetDefault(ADDON_VIZ, viz);
179+
if (!CAddonMgr::Get()->GetDefault(ADDON_VIZ, viz))
180+
return false;
181+
180182
m_addon = boost::dynamic_pointer_cast<CVisualisation>(viz);
181183
if (!m_addon)
182184
return false;

0 commit comments

Comments
 (0)