fix: STAA-7 remediation commit i

livingrockrises · livingrockrises · commit 2f8d809bd056 · 2025-05-06T20:14:14.000+04:00
diff --git a/src/core/ModuleManager.sol b/src/core/ModuleManager.sol
@@ -774,8 +774,8 @@ abstract contract ModuleManager is AllStorage, EIP712, IModuleManager {
       // 0xf23a6e61: `onERC1155Received(address,address,uint256,uint256,bytes)`.
       // 0xbc197c81: `onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)`.
       if or(eq(s, 0x150b7a02), or(eq(s, 0xf23a6e61), eq(s, 0xbc197c81))) {
-        mstore(0x20, s) // Store `msg.sig`.
-        return(0x3c, 0x20) // Return `msg.sig`.
+        mstore(0x00, shl(224, s)) // Store msg.sig left-aligned in scratch space memory[0:32]
+        return(0x00, 0x20) // Return clean 32-byte value for msg.sig
       }
     }
     // if there was no handler and it is not the onERCXXXReceived call, revert

Original file line number	Diff line number	Diff line change
`@@ -774,8 +774,8 @@ abstract contract ModuleManager is AllStorage, EIP712, IModuleManager {`
`774`	`774`	// 0xf23a6e61: `onERC1155Received(address,address,uint256,uint256,bytes)`.
`775`	`775`	// 0xbc197c81: `onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)`.
`776`	`776`	`if or(eq(s, 0x150b7a02), or(eq(s, 0xf23a6e61), eq(s, 0xbc197c81))) {`
`777`		- mstore(0x20, s) // Store `msg.sig`.
`778`		- return(0x3c, 0x20) // Return `msg.sig`.
	`777`	`+ mstore(0x00, shl(224, s)) // Store msg.sig left-aligned in scratch space memory[0:32]`
	`778`	`+ return(0x00, 0x20) // Return clean 32-byte value for msg.sig`
`779`	`779`	`}`
`780`	`780`	`}`
`781`	`781`	`// if there was no handler and it is not the onERCXXXReceived call, revert`