Merge branch 'dev' into fix-unicode-src-mappings

crytic · Feb 24, 2025 · 260b744 · 260b744
2 parents e7c791b + 88fdafb
commit 260b744
Show file tree

Hide file tree

Showing 16 changed files with 82 additions and 17 deletions.
diff --git a/slither/solc_parsing/yul/parse_yul.py b/slither/solc_parsing/yul/parse_yul.py
@@ -798,27 +798,12 @@ def parse_yul_identifier(root: YulScope, _node: YulNode, ast: Dict) -> Optional[
     if name in builtins:
         return Identifier(YulBuiltin(name))
 
-    # check function-scoped variables
-    parent_func = root.parent_func
-    if parent_func:
-        local_variable = parent_func.get_local_variable_from_name(name)
-        if local_variable:
-            return Identifier(local_variable)
-
-        if isinstance(parent_func, FunctionContract):
-            # Variables must be looked from the contract declarer
-            assert parent_func.contract_declarer
-            state_variable = parent_func.contract_declarer.get_state_variable_from_name(name)
-            if state_variable:
-                return Identifier(state_variable)
-
     # check yul-scoped variable
     variable = root.get_yul_local_variable_from_name(name)
     if variable:
         return Identifier(variable.underlying)
 
     # check yul-scoped function
-
     func = root.get_yul_local_function_from_name(name)
     if func:
         return Identifier(func.underlying)
@@ -840,6 +825,20 @@ def parse_yul_identifier(root: YulScope, _node: YulNode, ast: Dict) -> Optional[
         if func:
             return Identifier(func.underlying)
 
+    # check function-scoped variables
+    parent_func = root.parent_func
+    if parent_func:
+        local_variable = parent_func.get_local_variable_from_name(name)
+        if local_variable:
+            return Identifier(local_variable)
+
+        if isinstance(parent_func, FunctionContract):
+            # Variables must be looked from the contract declarer
+            assert parent_func.contract_declarer
+            state_variable = parent_func.contract_declarer.get_state_variable_from_name(name)
+            if state_variable:
+                return Identifier(state_variable)
+
     magic_suffix = _parse_yul_magic_suffixes(name, root)
     if magic_suffix:
         return magic_suffix

diff --git a/slither/tools/read_storage/read_storage.py b/slither/tools/read_storage/read_storage.py
@@ -578,11 +578,12 @@ def _find_struct_var_slot(
         slot = int.from_bytes(slot_as_bytes, "big")
         offset = 0
         type_to = ""
+        size = 0
         for var in elems:
             var_type = var.type
             if isinstance(var_type, ElementaryType):
                 size = var_type.size
-                if offset >= 256:
+                if size > (256 - offset):
                     slot += 1
                     offset = 0
                 if struct_var == var.name:

diff --git a/tests/e2e/solc_parsing/test_data/assembly-functions.sol b/tests/e2e/solc_parsing/test_data/assembly-functions.sol
@@ -10,3 +10,13 @@ contract A {
         }
     }
 }
+
+// Issue https://github.com/crytic/slither/issues/2655
+contract B {
+  function test(int256 a) internal {
+    assembly  {
+      function a() {}
+      function b() { a() }
+    }
+  }
+}
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.6.9-compact.zip
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.6.9-legacy.zip
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.7.6-compact.zip
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.7.6-legacy.zip
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.8.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-functions.sol-0.8.16-compact.zip
diff --git a/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.6.9-compact.json b/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.6.9-compact.json
@@ -8,5 +8,10 @@
     "foo.asm_0.w.a()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n}\n",
     "foo.asm_0.w.b()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n",
     "foo.asm_0.g()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n"
+  },
+  "B": {
+    "test(int256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: INLINE ASM 1\n\"];\n1->2;\n2[label=\"Node Type: END INLINE ASM 2\n\"];\n}\n",
+    "test.asm_0.a()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n}\n",
+    "test.asm_0.b()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n"
   }
 }
diff --git a/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.6.9-legacy.json b/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.6.9-legacy.json
@@ -1,5 +1,8 @@
 {
   "A": {
     "foo()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: INLINE ASM 1\n\"];\n1->2;\n2[label=\"Node Type: END INLINE ASM 2\n\"];\n}\n"
+  },
+  "B": {
+    "test(int256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: INLINE ASM 1\n\"];\n1->2;\n2[label=\"Node Type: END INLINE ASM 2\n\"];\n}\n"
   }
 }
diff --git a/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.7.6-compact.json b/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.7.6-compact.json
@@ -8,5 +8,10 @@
     "foo.asm_0.w.a()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n}\n",
     "foo.asm_0.w.b()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n",
     "foo.asm_0.g()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n"
+  },
+  "B": {
+    "test(int256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: INLINE ASM 1\n\"];\n1->2;\n2[label=\"Node Type: END INLINE ASM 2\n\"];\n}\n",
+    "test.asm_0.a()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n}\n",
+    "test.asm_0.b()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n"
   }
 }
diff --git a/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.7.6-legacy.json b/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.7.6-legacy.json
@@ -1,5 +1,8 @@
 {
   "A": {
     "foo()": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: INLINE ASM 1\n\"];\n1->2;\n2[label=\"Node Type: END INLINE ASM 2\n\"];\n}\n"
+  },
+  "B": {
+    "test(int256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: INLINE ASM 1\n\"];\n1->2;\n2[label=\"Node Type: END INLINE ASM 2\n\"];\n}\n"
   }
 }
diff --git a/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.8.16-compact.json b/tests/e2e/solc_parsing/test_data/expected/assembly-functions.sol-0.8.16-compact.json
@@ -8,5 +8,10 @@
     "foo.asm_0.w.a()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n}\n",
     "foo.asm_0.w.b()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n",
     "foo.asm_0.g()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n"
+  },
+  "B": {
+    "test(int256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: INLINE ASM 1\n\"];\n1->2;\n2[label=\"Node Type: END INLINE ASM 2\n\"];\n}\n",
+    "test.asm_0.a()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n}\n",
+    "test.asm_0.b()": "digraph{\n0[label=\"Node Type: INLINE ASM 0\n\"];\n0->1;\n1[label=\"Node Type: ENTRY_POINT 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n}\n"
   }
 }
diff --git a/tests/tools/read-storage/test_data/StorageLayout.bin b/tests/tools/read-storage/test_data/StorageLayout.bin
diff --git a/tests/tools/read-storage/test_data/StorageLayout.sol b/tests/tools/read-storage/test_data/StorageLayout.sol
@@ -36,6 +36,11 @@ contract StorageLayout {
     uint[][] multidimensionalArray;
     PackedStruct[] dynamicArrayOfStructs;
     PackedStruct[3] fixedArrayOfStructs;
+    struct BiggerStruct {
+        uint64 x;
+        uint256 y;
+    }
+    BiggerStruct big;
 
     function store() external {
         require(_address == address(0));
@@ -71,5 +76,6 @@ contract StorageLayout {
 
        mappingDynamicArrayOfStructs[_address].push(dynamicArrayOfStructs[0]);
        mappingDynamicArrayOfStructs[_address].push(dynamicArrayOfStructs[1]);
+        big = BiggerStruct(10,100);
     }
 }
diff --git a/tests/tools/read-storage/test_data/TEST_storage_layout.json b/tests/tools/read-storage/test_data/TEST_storage_layout.json
@@ -572,5 +572,33 @@
                 }
             }
         }
+    },
+    "big": {
+    "name": "big",
+    "type_string": "StorageLayout.BiggerStruct",
+    "slot": 21,
+    "size": 512,
+    "offset": 0,
+    "value": "000000000000000000000000000000000000000000000000000000000000000a",
+    "elems": {
+        "x": {
+            "name": "big.x",
+            "type_string": "uint64",
+            "slot": 21,
+            "size": 64,
+            "offset": 0,
+            "value": 10,
+            "elems": {}
+        },
+        "y": {
+            "name": "big.y",
+            "type_string": "uint256",
+            "slot": 22,
+            "size": 256,
+            "offset": 0,
+            "value": 100,
+            "elems": {}
+        }
     }
 }
+}