From 4a089f2afcc8a7aae218474c7aedb52fe69d1b12 Mon Sep 17 00:00:00 2001 From: dianakocsis Date: Fri, 30 Aug 2024 15:21:52 -0400 Subject: [PATCH] OZ N-16 --- src/base/BaseActionsRouter.sol | 2 +- src/libraries/CalldataDecoder.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/BaseActionsRouter.sol b/src/base/BaseActionsRouter.sol index ddc5ae5fb..dc104e491 100644 --- a/src/base/BaseActionsRouter.sol +++ b/src/base/BaseActionsRouter.sol @@ -52,7 +52,7 @@ abstract contract BaseActionsRouter is SafeCallback { /// @notice function that returns address considered executer of the actions /// @dev The other context functions, _msgData and _msgValue, are not supported by this contract /// In many contracts this will be the address that calls the initial entry point that calls `_executeActions` - /// `msg.sender` shouldnt be used, as this will be the v4 pool manager contract that calls `unlockCallback` + /// `msg.sender` shouldn't be used, as this will be the v4 pool manager contract that calls `unlockCallback` /// If using ReentrancyLock.sol, this function can return _getLocker() function msgSender() public view virtual returns (address); diff --git a/src/libraries/CalldataDecoder.sol b/src/libraries/CalldataDecoder.sol index 8041eb645..a01cf0762 100644 --- a/src/libraries/CalldataDecoder.sol +++ b/src/libraries/CalldataDecoder.sol @@ -36,7 +36,7 @@ library CalldataDecoder { // Calculate how far `params` is into the provided bytes let relativeOffset := sub(params.offset, _bytes.offset) - // Check that that isnt longer than the bytes themselves, or revert + // Check that that isn't longer than the bytes themselves, or revert if lt(_bytes.length, add(params.length, relativeOffset)) { mstore(0, SLICE_ERROR_SELECTOR) revert(0, 0x04)