Fix univ/2 bug converting from strings, re issue #164

trealla-prolog · May 10, 2023 · f99576b · f99576b
1 parent 1789015
commit f99576b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/predicates.c b/src/predicates.c
@@ -1841,6 +1841,12 @@ static bool fn_iso_univ_2(query *q)
 			cell *tmp2 = alloc_on_tmp(q, h->nbr_cells);
 			check_heap_error(tmp2);
 			copy_cells(tmp2, h, h->nbr_cells);
+
+			if (is_cstring(tmp2)) {
+				share_cell(tmp2);
+				convert_to_literal(q->st.m, tmp2);
+			}
+
 			p2 = LIST_TAIL(p2);
 			arity++;
 		}
@@ -1855,11 +1861,6 @@ static bool fn_iso_univ_2(query *q)
 		cell *tmp2 = get_tmp_heap(q, 0);
 		pl_idx_t nbr_cells = tmp_heap_used(q);
 
-		if (is_cstring(tmp2) && !is_string(tmp2)) {
-			share_cell(tmp2);
-			convert_to_literal(q->st.m, tmp2);
-		}
-
 		if (!is_interned(tmp2) && arity)
 			return throw_error(q, tmp2, q->st.curr_frame, "type_error", "atom");