From 1977123b4c48949de24a7a650c576ff65826917b Mon Sep 17 00:00:00 2001 From: John Andrews Date: Tue, 8 Mar 2022 14:54:07 +1300 Subject: [PATCH] added stringisnull check to variables output to executor node --- BasicNodes/Tools/Executor.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BasicNodes/Tools/Executor.cs b/BasicNodes/Tools/Executor.cs index f5b2fa6d..b3b7e5ea 100644 --- a/BasicNodes/Tools/Executor.cs +++ b/BasicNodes/Tools/Executor.cs @@ -15,7 +15,7 @@ public override FlowElementType Type => FlowElementType.Process; public override string Icon => "fas fa-terminal"; - private const string VariablePattern = @"(^[\s]*$)|(^([a-zA-Z_]+)[a-zA-Z_0-9]*$)"; + internal const string VariablePattern = @"(^[\s]*$)|(^([a-zA-Z_]+)[a-zA-Z_0-9]*$)"; [Required] [File(1)] @@ -69,14 +69,14 @@ return -1; } bool success = task.Result.ExitCode == this.SuccessCode; - if(Regex.IsMatch(OutputVariable ?? string.Empty, VariablePattern)) + if(string.IsNullOrWhiteSpace(OutputVariable) == false && Regex.IsMatch(OutputVariable, VariablePattern)) { args.UpdateVariables(new Dictionary { { OutputVariable, task.Result.StandardOutput } }); } - if (Regex.IsMatch(OutputErrorVariable ?? string.Empty, VariablePattern)) + if (string.IsNullOrWhiteSpace(OutputErrorVariable) == false && Regex.IsMatch(OutputErrorVariable ?? string.Empty, VariablePattern)) { args.UpdateVariables(new Dictionary {