renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

plugin(fix): catch crash with pcall in event handlers

Browse Source
This commit is contained in:
Qingping Hou
2017-04-21 04:04:02 -07:00
parent f2671a3e20
commit 8df1e14b6f
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/pluginloader.lua
View File

@@ -3,6 +3,25 @@ local logger = require("logger")
local DEFAULT_PLUGIN_PATH = "plugins"
local function sandboxPluginEventHandlers(plugin)
for key, value in pairs(plugin) do
if key:sub(1, 2) == "on" and type(value) == "function" then
plugin[key] = function(self, ...)
local ok, re = pcall(value, self, ...)
if ok then
return re
else
logger.err("failed to call event handler", key, re)
return false
end
end
end
end
end
local PluginLoader = {}
function PluginLoader:loadPlugins()
@@ -47,6 +66,7 @@ function PluginLoader:loadPlugins()
elseif type(plugin_module.disabled) ~= "boolean" or not plugin_module.disabled then
plugin_module.path = plugin_root
plugin_module.name = plugin_module.name or plugin_root:match("/(.-)%.koplugin")
sandboxPluginEventHandlers(plugin_module)
table.insert(self.plugins, plugin_module)
else
logger.info("Plugin ", mainfile, " has been disabled.")