fix: check for unread params bytes in all cases

filecoin-project · Jan 14, 2023 · 99bc0aa · 99bc0aa
1 parent cb10108
commit 99bc0aa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/chain/types/ethtypes/eth_transactions.go b/chain/types/ethtypes/eth_transactions.go
@@ -108,16 +108,17 @@ func EthTxArgsFromMessage(msg *types.Message) (EthTxArgs, error) {
 				return EthTxArgs{}, xerrors.Errorf("failed to read params byte array: %w", err)
 			}
 
-			if paramsReader.Len() != 0 {
-				return EthTxArgs{}, xerrors.Errorf("extra data found in params")
-			}
 			if len(params) == 0 {
 				// Otherwise, we don't get a guaranteed round-trip.
 				return EthTxArgs{}, xerrors.Errorf("cannot invoke contracts with empty parameters from an eth-account")
 			}
 		}
 	}
 
+	if paramsReader.Len() != 0 {
+		return EthTxArgs{}, xerrors.Errorf("extra data found in params")
+	}
+
 	return EthTxArgs{
 		ChainID:              build.Eip155ChainId,
 		Nonce:                int(msg.Nonce),