Fix ERC165

Author: ernestognw

contracts/mocks/ERC165/ERC165MaliciousData.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.20;
 
-import {IERC165} from "../../utils/introspection/IERC165.sol";
+import {IERC165} from "../utils/introspection/IERC165.sol";
 
 /**
  * https://eips.ethereum.org/EIPS/eip-214#specification
@@ -56,3 +56,40 @@ contract ERC165InterfacesSupported is SupportsInterfaceWithLookupMock {
         }
     }
 }
+
+contract ERC165MaliciousData {
+    function supportsInterface(bytes4) public pure returns (bool) {
+        assembly {
+            mstore(0, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            return(0, 32)
+        }
+    }
+}
+
+contract ERC165MissingData {
+    function supportsInterface(bytes4 interfaceId) public view {} // missing return
+}
+
+contract ERC165NotSupported {}
+
+contract ERC165ReturnBombMock is IERC165 {
+    function supportsInterface(bytes4 interfaceId) public pure override returns (bool) {
+        if (interfaceId == type(IERC165).interfaceId) {
+            assembly {
+                mstore(0, 1)
+            }
+        }
+        assembly {
+            return(0, 101500)
+        }
+    }
+}
+
+contract ERC165RevertInvalid is IERC165 {
+    function supportsInterface(bytes4 interfaceId) public view virtual returns (bool) {
+        if (interfaceId == 0xffffffff) {
+            revert();
+        }
+        return interfaceId == type(IERC165).interfaceId; // 0x01ffc9a7
+    }
+}

contracts/mocks/ERC165/ERC165MissingData.sol

@@ -22,9 +22,9 @@ library ERC165Checker {
     function supportsERC165(address account) internal view returns (bool) {
         // Any contract that implements ERC-165 must explicitly indicate support of
         // InterfaceId_ERC165 and explicitly indicate non-support of InterfaceId_Invalid
-        return
-            supportsERC165InterfaceUnchecked(account, type(IERC165).interfaceId) &&
-            !supportsERC165InterfaceUnchecked(account, INTERFACE_ID_INVALID);
+        if (!supportsERC165InterfaceUnchecked(account, type(IERC165).interfaceId)) return false;
+        (bool success, bool supported) = trySupportsInterface(account, INTERFACE_ID_INVALID);
+        return success && !supported;
     }
 
     /**
@@ -106,19 +106,32 @@ library ERC165Checker {
      * Interface identification is specified in ERC-165.
      */
     function supportsERC165InterfaceUnchecked(address account, bytes4 interfaceId) internal view returns (bool) {
-        // prepare call
-        bytes memory encodedParams = abi.encodeCall(IERC165.supportsInterface, (interfaceId));
+        (bool success, bool supported) = trySupportsInterface(account, interfaceId);
+        return success && supported;
+    }
 
-        // perform static call
-        bool success;
+    /**
+     * @dev Attempts to call `supportsInterface` on a contract and returns both the call
+     * success status and the interface support result.
+     *
+     * This function performs a low-level static call to the contract's `supportsInterface`
+     * function. It returns:
+     *
+     * * `success`: true if the call didn't revert, false if it did
+     * * `supported`: true if the call succeeded AND returned data indicating the interface is supported
+     */
+    function trySupportsInterface(
+        address account,
+        bytes4 interfaceId
+    ) internal view returns (bool success, bool supported) {
         uint256 returnSize;
         uint256 returnValue;
+        bytes memory encodedParams = abi.encodeCall(IERC165.supportsInterface, (interfaceId));
         assembly ("memory-safe") {
             success := staticcall(30000, account, add(encodedParams, 0x20), mload(encodedParams), 0x00, 0x20)
             returnSize := returndatasize()
             returnValue := mload(0x00)
         }
-
-        return success && returnSize >= 0x20 && returnValue > 0;
+        return (success, returnSize >= 0x20 && returnValue > 0);
     }
 }