Fix bug in address calculation.

data61 · Mar 28, 2024 · 2250107 · 2250107
1 parent bd1a3cb
commit 2250107
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Compiler/types.py b/Compiler/types.py
@@ -5770,6 +5770,8 @@ def get_address(self, index, size=None):
         if isinstance(index, (_secret, _single)):
             raise CompilerError('need cleartext index')
         key = str(index), size or 1
+        if not util.is_constant(index):
+            index = regint.conv(index)
         if self.length is not None:
             from .GC.types import cbits
             if isinstance(index, int):
@@ -5778,9 +5780,9 @@ def get_address(self, index, size=None):
                     raise IndexError('index %s, length %s' % \
                                          (str(index), str(self.length)))
             elif self.check_indices and not isinstance(index, cbits):
-                library.runtime_error_if(regint.conv(index) >= self.length,
-                                         'overflow: %s/%s',
-                                         index, self.length)
+                library.runtime_error_if(
+                    (index >= self.length).bit_or(index < 0),
+                    'overflow: %s/%s', index, self.length)
         if (program.curr_block, key) not in self.address_cache:
             n = self.value_type.n_elements()
             length = self.length