mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Fix #13469: Exception thrown from plugin in context.subscribe (#13470)

Browse Source 
Throw a JavaScript exception, not a C++ exception when invalid parameters are passed to subscribe.
This commit is contained in:
Ted John
2020-11-28 13:03:15 +00:00
committed by GitHub
parent 9c27e3a9ce
commit 55dc985c57
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/scripting/ScContext.hpp
View File

@@ -156,21 +156,24 @@ namespace OpenRCT2::Scripting
std::shared_ptr<ScDisposable> subscribe(const std::string& hook, const DukValue& callback)
{
auto& scriptEngine = GetContext()->GetScriptEngine();
auto ctx = scriptEngine.GetContext();
auto hookType = GetHookType(hook);
if (hookType == HOOK_TYPE::UNDEFINED)
{
throw DukException() << "Unknown hook type: " << hook;
duk_error(ctx, DUK_ERR_ERROR, "Unknown hook type");
}
if (!callback.is_function())
{
throw DukException() << "Expected function for callback";
duk_error(ctx, DUK_ERR_ERROR, "Expected function for callback");
}
auto owner = _execInfo.GetCurrentPlugin();
if (owner == nullptr)
{
throw DukException() << "Not in a plugin context";
duk_error(ctx, DUK_ERR_ERROR, "Not in a plugin context");
}
auto cookie = _hookEngine.Subscribe(hookType, owner, callback);