From 91e2c0c4e476bb5bdd17e587bd97ff75f412602e Mon Sep 17 00:00:00 2001
From: Gemini <gemini@example.com>
Date: Tue, 30 Jun 2026 01:47:47 -0400
Subject: [PATCH] fix: handle revert modifiers in incorrect-modifier

---
 slither/detectors/functions/modifier.py       |   3 +-
 ...etection_0_8_4_modifier_reverts_sol__0.txt |   0
 .../0.8.4/modifier_reverts.sol                |  31 ++++++++++++++++++
 .../0.8.4/modifier_reverts.sol-0.8.4.zip      | Bin 0 -> 3148 bytes
 tests/e2e/detectors/test_detectors.py         |   5 +++
 5 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/e2e/detectors/snapshots/detectors__detector_ModifierDefaultDetection_0_8_4_modifier_reverts_sol__0.txt
 create mode 100644 tests/e2e/detectors/test_data/incorrect-modifier/0.8.4/modifier_reverts.sol
 create mode 100644 tests/e2e/detectors/test_data/incorrect-modifier/0.8.4/modifier_reverts.sol-0.8.4.zip

diff --git a/slither/detectors/functions/modifier.py b/slither/detectors/functions/modifier.py
index cfafecda43..80e0f0f443 100644
--- a/slither/detectors/functions/modifier.py
+++ b/slither/detectors/functions/modifier.py
@@ -17,7 +17,8 @@
 
 def is_revert(node: Node) -> bool:
     return node.type == NodeType.THROW or any(
-        ir.function.name in ["revert()", "revert(string"] for ir in node.internal_calls
+        ir.function.name in ["revert()", "revert(string)"] or ir.function.name.startswith("revert ")
+        for ir in node.internal_calls
     )
 
 
diff --git a/tests/e2e/detectors/snapshots/detectors__detector_ModifierDefaultDetection_0_8_4_modifier_reverts_sol__0.txt b/tests/e2e/detectors/snapshots/detectors__detector_ModifierDefaultDetection_0_8_4_modifier_reverts_sol__0.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/e2e/detectors/test_data/incorrect-modifier/0.8.4/modifier_reverts.sol b/tests/e2e/detectors/test_data/incorrect-modifier/0.8.4/modifier_reverts.sol
new file mode 100644
index 0000000000..479b186296
--- /dev/null
+++ b/tests/e2e/detectors/test_data/incorrect-modifier/0.8.4/modifier_reverts.sol
@@ -0,0 +1,31 @@
+pragma solidity ^0.8.4;
+
+contract Test {
+    address owner;
+
+    error NotOwner();
+
+    modifier onlyOwnerStr() {
+        if (msg.sender == owner) {
+            _;
+        } else {
+            revert("not owner");
+        }
+    }
+
+    modifier onlyOwnerErr() {
+        if (msg.sender == owner) {
+            _;
+        } else {
+            revert NotOwner();
+        }
+    }
+
+    function f() external onlyOwnerStr returns (uint256) {
+        return 1;
+    }
+
+    function g() external onlyOwnerErr returns (uint256) {
+        return 2;
+    }
+}
diff --git a/tests/e2e/detectors/test_data/incorrect-modifier/0.8.4/modifier_reverts.sol-0.8.4.zip b/tests/e2e/detectors/test_data/incorrect-modifier/0.8.4/modifier_reverts.sol-0.8.4.zip
new file mode 100644
index 0000000000000000000000000000000000000000..a1609ff545ceb5bc2a127fcc0c8d72f74adfdd63
GIT binary patch
literal 3148
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
azw!U_zO@At^S^z%Keqpq)IXmA0Qe7uH}wes

literal 0
HcmV?d00001

diff --git a/tests/e2e/detectors/test_detectors.py b/tests/e2e/detectors/test_detectors.py
index 7bd6e34600..bd0cb02847 100644
--- a/tests/e2e/detectors/test_detectors.py
+++ b/tests/e2e/detectors/test_detectors.py
@@ -1326,6 +1326,11 @@ def id_test(test_item: Test):
         "modifier_default.sol",
         "0.7.6",
     ),
+    Test(
+        all_detectors.ModifierDefaultDetection,
+        "modifier_reverts.sol",
+        "0.8.4",
+    ),
     Test(
         all_detectors.IncorrectUnaryExpressionDetection,
         "invalid_unary_expression.sol",