jsonrpc: fix Addons.SetAddonEnabled() for invalid addonid values

xbmc · Sep 16, 2015 · 21034c8 · 21034c8
1 parent 4739825
commit 21034c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/xbmc/interfaces/json-rpc/AddonsOperations.cpp b/xbmc/interfaces/json-rpc/AddonsOperations.cpp
@@ -144,6 +144,11 @@ JSONRPC_STATUS CAddonsOperations::GetAddonDetails(const std::string &method, ITr
 JSONRPC_STATUS CAddonsOperations::SetAddonEnabled(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
   std::string id = parameterObject["addonid"].asString();
+  AddonPtr addon;
+  if (!CAddonMgr::GetInstance().GetAddon(id, addon, ADDON::ADDON_UNKNOWN, false) || addon == nullptr ||
+    addon->Type() <= ADDON_UNKNOWN || addon->Type() >= ADDON_MAX)
+    return InvalidParams;
+
   bool disabled = false;
   if (parameterObject["enabled"].isBoolean())
     disabled = !parameterObject["enabled"].asBoolean();

diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-6.28.0
+6.28.1