Skip to content

ns: Add function dereference protection to .ns.protectedExecute [#115] #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

ns: Add function dereference protection to .ns.protectedExecute [#115] #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/ns.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
/ 0b: Uses '@' to provide legacy protected execution, returning just the exception (available with all kdb+ versions)
.ns.cfg.protectExecWithStack:0b;

/ Modifies the behaviour of '.ns.protectedExecute' when de-referencing a supplied function reference. If false, if reference
/ is not set or not a function, a unhandled exception will be thrown. If true, the error will be handled and returned the same
/ way as the actual execution of the function (a dictionary)
.ns.cfg.protectExecDerefProtect:0b;


/ Value to check if the execution fails in .ns.protectedExecute
/ @see .ns.protectedExecute
Expand Down Expand Up @@ -106,9 +111,23 @@
/ @param func (Symbol) The function to execute
/ @param args () The arguments to pass to the function. Pass generic null (::) if function requires no arguments
/ @returns () The results of the function or a dictionary `isError`errorMsg!(`PROT_EXEC_FAILED; theError) if it fails. If running with '.ns.cfg.protectExecWithStack' enabled, `backtrace will also be added as the 2nd element
/ @see .ns.i.getFunction
/ @see .ns.cfg.protectExecDerefProtect
/ @see .ns.cfg.protectExecWithStack
.ns.protectedExecute:{[func;args]
func:.ns.i.getFunction func;
if[not .type.isFunction func;
if[.ns.cfg.protectExecDerefProtect;
func:.z.s[.ns.i.getFunction; func];

if[.ns.const.pExecFailure ~ first func;
:func;
];
];

if[not .ns.cfg.protectExecDerefProtect;
func:.ns.i.getFunction func;
];
];

funcArgCount:count .ns.getFunctionArguments func;

Expand Down