Merge pull request #539 from crytic/dev-fix-tuple-low-level

Fix incorrect tuple type in case of low level call
crytic · Jul 19, 2020 · 3ffdbcd · 3ffdbcd
2 parents 9e69274 + c9fdc0b
commit 3ffdbcd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/slither/slithir/convert.py b/slither/slithir/convert.py
@@ -763,7 +763,10 @@ def convert_to_low_level(ir):
         new_ir.call_gas = ir.call_gas
         new_ir.call_value = ir.call_value
         new_ir.arguments = ir.arguments
-        new_ir.lvalue.set_type(ElementaryType('bool'))
+        if ir.slither.solc_version >= "0.5":
+            new_ir.lvalue.set_type([ElementaryType('bool'), ElementaryType('bytes')])
+        else:
+            new_ir.lvalue.set_type(ElementaryType('bool'))
         new_ir.set_expression(ir.expression)
         new_ir.set_node(ir.node)
         return new_ir

diff --git a/slither/slithir/operations/low_level_call.py b/slither/slithir/operations/low_level_call.py
@@ -95,9 +95,14 @@ def __str__(self):
         arguments = []
         if self.arguments:
             arguments = self.arguments
+        return_type = self.lvalue.type
+
+        if return_type and isinstance(return_type, list):
+            return_type = ','.join(str(x) for x in return_type)
+
         txt = '{}({}) = LOW_LEVEL_CALL, dest:{}, function:{}, arguments:{} {} {}'
         return txt.format(self.lvalue,
-                          self.lvalue.type,
+                          return_type,
                           self.destination,
                           self.function_name,
                           [str(x) for x in arguments],

diff --git a/slither/visitors/slithir/expression_to_slithir.py b/slither/visitors/slithir/expression_to_slithir.py
@@ -115,14 +115,11 @@ def _post_assignement_operation(self, expression):
                 set_val(expression, None)
             else:
                 assert isinstance(right, TupleVariable)
-                tuple_types = []
                 for idx in range(len(left)):
                     if not left[idx] is None:
                         operation = Unpack(left[idx], right, idx)
                         operation.set_expression(expression)
-                        tuple_types.append(left[idx].type)
                         self._result.append(operation)
-                right.set_type(tuple_types)
                 set_val(expression, None)
         else:
             # Init of array, like