~~

kalidao · Aug 17, 2023 · 17a65b9 · 17a65b9
1 parent ddc1dee
commit 17a65b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Keep.sol b/src/Keep.sol
@@ -363,6 +363,7 @@ contract Keep is ERC1155TokenReceiver, KeepToken, Multicallable {
         bytes memory data
     ) internal virtual {
         if (op == Operation.call) {
+            /// @solidity memory-safe-assembly
             assembly {
                 let success := call(
                     gas(),
@@ -383,6 +384,7 @@ contract Keep is ERC1155TokenReceiver, KeepToken, Multicallable {
                 }
             }
         } else if (op == Operation.delegatecall) {
+            /// @solidity memory-safe-assembly
             assembly {
                 let success := delegatecall(
                     gas(),
@@ -402,6 +404,7 @@ contract Keep is ERC1155TokenReceiver, KeepToken, Multicallable {
                 }
             }
         } else {
+            /// @solidity memory-safe-assembly
             assembly {
                 if iszero(create(value, add(data, 0x20), mload(data))) {
                     revert(0, 0)
@@ -433,9 +436,9 @@ contract Keep is ERC1155TokenReceiver, KeepToken, Multicallable {
             // This also confirms non-zero `user`.
             if (balanceOf[ecrecover(hash, v, r, s)][SIGN_KEY] != 0)
                 return this.isValidSignature.selector;
-        } else {
-            return 0xffffffff;
         }
+
+        return 0xffffffff;
     }
 
     /// -----------------------------------------------------------------------

diff --git a/src/KeepToken.sol b/src/KeepToken.sol
@@ -130,6 +130,7 @@ abstract contract KeepToken {
         virtual
         returns (bytes32 separator)
     {
+        /// @solidity memory-safe-assembly
         assembly {
             let m := mload(0x40) // Load the free memory pointer.
             mstore(
@@ -256,18 +257,19 @@ abstract contract KeepToken {
     /// -----------------------------------------------------------------------
 
     function name() public pure virtual returns (string memory) {
-        uint256 placeholder;
+        uint256 n;
 
+        /// @solidity memory-safe-assembly
         assembly {
-            placeholder := sub(
+            n := sub(
                 calldatasize(),
                 add(shr(240, calldataload(sub(calldatasize(), 2))), 2)
             )
 
-            placeholder := calldataload(add(placeholder, 2))
+            n := calldataload(add(n, 2))
         }
 
-        return string(abi.encodePacked(placeholder));
+        return string(abi.encodePacked(n));
     }
 
     string public constant symbol = "KEEP";