Fixes

Author: Schamper

dissect/database/ese/ntds/database.py

@@ -201,8 +201,11 @@ def children_of(self, dnt: int) -> Iterator[Object]:
         cursor.seek([dnt])
 
         record = cursor.record()
-        while record is not None and record != end:
+        while record is not None:
             yield Object.from_record(self.db, record)
+            if record == end:
+                break
+
             record = cursor.next()
 
     def _make_dn(self, dnt: int) -> DN:

dissect/database/ese/ntds/query.py

@@ -124,6 +124,7 @@ def _process_or_operation(self, filter: SearchFilter, records: Iterator[Record]
         Yields:
             Records matching any condition in the OR operation.
         """
+        records = list(records) if records is not None else None
         for child in filter.children:
             yield from self._process_query(child, records=records)
 
@@ -186,8 +187,10 @@ def _process_wildcard_tail(index: Index, filter_value: str) -> Iterator[Record]:
 
     # Yield all records in range
     record = cursor.record()
-    while record is not None and record != end:
+    while record is not None:
         yield record
+        if record == end:
+            break
         record = cursor.next()