clamp lower_bound_of_target_clause index (#840)

mthom · Dec 18, 2023 · 299df50 · 299df50
1 parent 3353306
commit 299df50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/machine/compile.rs b/src/machine/compile.rs
@@ -49,7 +49,7 @@ fn lower_bound_of_target_clause(skeleton: &mut PredicateSkeleton, target_pos: us
 
     let index = target_pos - 1;
 
-    if let Some(index_loc) = skeleton.clauses[index]
+    let index = if let Some(index_loc) = skeleton.clauses[index]
         .opt_arg_index_key
         .switch_on_term_loc()
     {
@@ -66,7 +66,9 @@ fn lower_bound_of_target_clause(skeleton: &mut PredicateSkeleton, target_pos: us
         }
     } else {
         index
-    }
+    };
+
+    index.clamp(0, skeleton.clauses.len() - 1)
 }
 
 fn derelictize_try_me_else(

diff --git a/src/machine/load_state.rs b/src/machine/load_state.rs
@@ -504,13 +504,9 @@ impl<'a, LS: LoadState<'a>> Loader<'a, LS> {
             if !code_index.is_undefined() && !code_index.is_dynamic_undefined() {
                 let old_index_ptr = code_index.replace(IndexPtr::undefined());
 
-                self.payload
-                    .retraction_info
-                    .push_record(RetractionRecord::ReplacedModulePredicate(
-                        module_name,
-                        *key,
-                        old_index_ptr,
-                    ));
+                self.payload.retraction_info.push_record(
+                    RetractionRecord::ReplacedModulePredicate(module_name, *key, old_index_ptr),
+                );
             }
         }