ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2026-06-07 10:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

add error logging for qjs

Browse Source
This commit is contained in:
Richard Holland
2024-07-16 12:31:02 +10:00
parent f96daa0014
commit 9db9ad2123
1 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/ripple/app/hook/applyHook.h
View File

@@ -1591,39 +1591,54 @@ public:
val =
JS_Eval(vm.ctx, expr, expr_len, "<qjsvm>", 0);
if (JS_IsException(val))
{
JS_FreeValue(ctx, val);
//JS_FreeValue(ctx, obj);
JSValue exception_val = JS_GetException(ctx);
int is_error;
if (hookCtx.result.exitType == hook_api::ExitType::ACCEPT ||
hookCtx.result.exitType == hook_api::ExitType::ROLLBACK)
is_error = JS_IsError(ctx, exception_val);
{
// this is an accept or rollback, which is handled as an internal exception
// to facilitate easy exit from the jsvm, but it's not actuall an error
// so do nothing
}
else
{
const char* str = JS_ToCString(ctx, obj);
const char *str;
JLOG(j.warn()) << "HookError[" << HC_ACC()
<< "]: Could not create QUICKJS instance (expr eval failure). "
<< "`" << expr << "` [size=" << expr_len << "]. "
<< str;
JS_FreeCString(ctx, str);
hookCtx.result.exitType = hook_api::ExitType::JSVM_ERROR;
str = JS_ToCString(ctx, exception_val);
if (str)
{
JLOG(j.warn()) << "HookError[" << HC_ACC() << "]: " << str;
JS_FreeCString(ctx, str);
}
else
{
JLOG(j.warn()) << "HookError[" << HC_ACC() << "]: [exception]";
}
}
return;
if (is_error) {
JSValue val = JS_GetPropertyStr(ctx, exception_val, "stack");
if (!JS_IsUndefined(val)) {
const char *str;
str = JS_ToCString(ctx, val);
if (str)
{
JLOG(j.warn()) << "HookError[" << HC_ACC() << "]: " << str;
JS_FreeCString(ctx, str);
}
else
{
JLOG(j.warn()) << "HookError[" << HC_ACC() << "]: [exception]";
}
}
JS_FreeValue(ctx, val);
}
JS_FreeValue(ctx, exception_val);
}
/*
// RHTODO: place jsvm_error exit type logic appropriately
hookCtx.result.exitType = hook_api::ExitType::JSVM_ERROR;
hookCtx.result.instructionCount = 0; //?
*/
JS_FreeValue(ctx, val);
//JS_FreeValue(ctx, obj);
hookCtx.result.instructionCount = 0; // RHTODO: fix this
}
HookExecutorJS(HookContext& ctx)