cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

rpc: fixed params parsing problem which could lead to a panic

Browse Source 
check argument type before parsing params
 recover from panic in ipc channel
This commit is contained in:
Bas van Kervel 2015-10-29 08:40:07 +01:00
parent 56f8699a6c
commit c3c5f8b654
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/api/eth_args.go
View File

@ -626,9 +626,14 @@ func (args *GetBlockByHashArgs) UnmarshalJSON(b []byte) (err error) {
args.IncludeTxs = obj[1].(bool) 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 GetBlockByNumberArgs struct { type GetBlockByNumberArgs struct {
BlockNumber int64 BlockNumber int64
IncludeTxs bool IncludeTxs bool
@ -648,11 +653,14 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) {
return err 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 { type BlockFilterArgs struct {
Earliest int64 Earliest int64
Latest int64 Latest int64

11
rpc/comms/comms.go
View File

@ -62,13 +62,18 @@ type EthereumClient interface {
func handle(id int, conn net.Conn, api shared.EthereumApi, c codec.Codec) { func handle(id int, conn net.Conn, api shared.EthereumApi, c codec.Codec) {
codec := c.New(conn) codec := c.New(conn)
defer func() {
if r := recover(); r != nil {
glog.Errorf("panic: %v\n", r)
}
codec.Close()
}()
for { for {
requests, isBatch, err := codec.ReadRequest() requests, isBatch, err := codec.ReadRequest()
if err == io.EOF { if err == io.EOF {
codec.Close()
return return
} else if err != nil { } else if err != nil {
codec.Close()
glog.V(logger.Debug).Infof("Closed IPC Conn %06d recv err - %v\n", id, err) glog.V(logger.Debug).Infof("Closed IPC Conn %06d recv err - %v\n", id, err)
return return
} }
@ -87,7 +92,6 @@ func handle(id int, conn net.Conn, api shared.EthereumApi, c codec.Codec) {
err = codec.WriteResponse(responses[:responseCount]) err = codec.WriteResponse(responses[:responseCount])
if err != nil { if err != nil {
codec.Close()
glog.V(logger.Debug).Infof("Closed IPC Conn %06d send err - %v\n", id, err) glog.V(logger.Debug).Infof("Closed IPC Conn %06d send err - %v\n", id, err)
return return
} }
@ -98,7 +102,6 @@ func handle(id int, conn net.Conn, api shared.EthereumApi, c codec.Codec) {
rpcResponse = shared.NewRpcResponse(requests[0].Id, requests[0].Jsonrpc, res, err) rpcResponse = shared.NewRpcResponse(requests[0].Id, requests[0].Jsonrpc, res, err)
err = codec.WriteResponse(rpcResponse) err = codec.WriteResponse(rpcResponse)
if err != nil { if err != nil {
codec.Close()
glog.V(logger.Debug).Infof("Closed IPC Conn %06d send err - %v\n", id, err) glog.V(logger.Debug).Infof("Closed IPC Conn %06d send err - %v\n", id, err)
return return
} }