Merge pull request #1945 from bas-vk/rpcparsing

Argument parsing can lead to panic in rpc channel

1 files changed, 11 insertions, 3 deletions

diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 6aca6a663..457350d74 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -626,7 +626,12 @@ func (args *GetBlockByHashArgs) UnmarshalJSON(b []byte) (err error) {
 
 	args.IncludeTxs = obj[1].(bool)
 
-	return nil
+	if inclTx, ok := obj[1].(bool); ok {
+		args.IncludeTxs = inclTx
+		return nil
+	}
+
+	return shared.NewInvalidTypeError("includeTxs", "not a bool")
 }
 
 type GetBlockByNumberArgs struct {
@@ -648,9 +653,12 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
 		return err
 	}
 
-	args.IncludeTxs = obj[1].(bool)
+	if inclTx, ok := obj[1].(bool); ok {
+		args.IncludeTxs = inclTx
+		return nil
+	}
 
-	return nil
+	return shared.NewInvalidTypeError("includeTxs", "not a bool")
 }
 
 type BlockFilterArgs struct {