From da19d7e633872ad1c4ba5155e714062ba5c8e5ae Mon Sep 17 00:00:00 2001 From: 3rdit Date: Thu, 22 Jan 2026 21:09:28 +0000 Subject: Fix TypeError when slicing FunctionList/BasicBlockList with [:], [n:], [:n] --- python/binaryview.py | 6 ++---- python/function.py | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'python') diff --git a/python/binaryview.py b/python/binaryview.py index 2f441f34..8a93b3cc 100644 --- a/python/binaryview.py +++ b/python/binaryview.py @@ -2466,10 +2466,8 @@ class FunctionList: return _function.Function(self._view, core.BNNewFunctionReference(self._funcs[i])) elif isinstance(i, slice): result = [] - if i.start < 0 or i.start >= len(self) or i.stop < 0 or i.stop >= len(self): - raise IndexError(f"Slice {i} out of bounds for FunctionList of size {len(self)}") - - for j in range(i.start, i.stop, i.step if i.step is not None else 1): + start, stop, step = i.indices(len(self)) + for j in range(start, stop, step): result.append(_function.Function(self._view, core.BNNewFunctionReference(self._funcs[j]))) return result raise ValueError("FunctionList.__getitem__ supports argument of type integer or slice") diff --git a/python/function.py b/python/function.py index 39c36356..70cd6a35 100644 --- a/python/function.py +++ b/python/function.py @@ -279,10 +279,8 @@ class BasicBlockList: return self._function._instantiate_block(block) elif isinstance(i, slice): result = [] - if i.start < 0 or i.start >= len(self) or i.stop < 0 or i.stop >= len(self): - raise IndexError(f"Slice {i} out of bounds for BasicBlockList of size {len(self)}") - - for j in range(i.start, i.stop, i.step if i.step is not None else 1): + start, stop, step = i.indices(len(self)) + for j in range(start, stop, step): block = core.BNNewBasicBlockReference(self._blocks[j]) assert block is not None, "core.BNNewBasicBlockReference returned None" result.append(self._function._instantiate_block(block)) -- cgit v1.3.1