From 00bf39204d18b44b844169abe39a7f83a0dd0e12 Mon Sep 17 00:00:00 2001
From: Mark Thom <markjordanthom@gmail.com>
Date: Wed, 17 Feb 2021 11:12:19 -0700
Subject: [PATCH] add missing variable checks in various places

---
 src/lib/builtins.pl | 3 ++-
 src/loader.pl       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/builtins.pl b/src/lib/builtins.pl
index 1396179b..c5a9d39a 100644
--- a/src/lib/builtins.pl
+++ b/src/lib/builtins.pl
@@ -261,7 +261,8 @@ call_or_cut(M:G, B) :-
     ;  call(M:G)
     ).
 call_or_cut(G, B) :-
-    (  '$call_with_default_policy'(control_functor(G)) ->
+    (  nonvar(G),
+       '$call_with_default_policy'(control_functor(G)) ->
        '$call_with_default_policy'(call_or_cut_interp(G, B))
     ;  call(G)
     ).
diff --git a/src/loader.pl b/src/loader.pl
index c34c57f4..20da327c 100644
--- a/src/loader.pl
+++ b/src/loader.pl
@@ -440,7 +440,8 @@ predicate_property(Callable, Property) :-
     ;  functor(Callable, (:), 2),
        arg(1, Callable, Module),
        arg(2, Callable, Callable0),
-       atom(Module) ->
+       atom(Module),
+       nonvar(Callable0) ->
        functor(Callable0, Name, Arity),
        (  atom(Name),
           Name \== [] ->
-- 
2.54.0