fix: add null-check to avoid runtime exceptions under some circumstances on returned values

wessberg · wessberg · commit d89671c80df9 · 2022-07-23T23:45:05.000+02:00
diff --git a/src/interpreter/policy/is-trap-condition-met.ts b/src/interpreter/policy/is-trap-condition-met.ts
@@ -58,7 +58,7 @@ function handleTrapCondition<T extends object, ConditionType>(
 	// If matching the condition depends on the provided arguments, pass them in
 	if (isTrapConditionFunction(trapCondition)) {
 		const castItem = item as IPolicyProxyApplyHookOptions<T> | IPolicyProxyConstructHookOptions<T>;
-		return trapCondition(...castItem.argArray) === matchCondition;
+		return castItem.argArray != null && trapCondition(...castItem.argArray) === matchCondition;
 	}
 
 	// Otherwise, evaluate the truthiness of the condition

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ function handleTrapCondition<T extends object, ConditionType>(`
`58`	`58`	`// If matching the condition depends on the provided arguments, pass them in`
`59`	`59`	`if (isTrapConditionFunction(trapCondition)) {`
`60`	`60`	`const castItem = item as IPolicyProxyApplyHookOptions<T> \| IPolicyProxyConstructHookOptions<T>;`
`61`		`- return trapCondition(...castItem.argArray) === matchCondition;`
	`61`	`+ return castItem.argArray != null && trapCondition(...castItem.argArray) === matchCondition;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Otherwise, evaluate the truthiness of the condition`