mirror/go-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/go-pulse.git synced 2024-12-25 21:07:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1945 from bas-vk/rpcparsing

Browse Source 
Argument parsing can lead to panic in rpc channel
This commit is contained in:
Jeffrey Wilcke 2015-10-29 16:55:51 +01:00
commit fd27f074fe
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,7 +626,12 @@ 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 {
@ -648,9 +653,12 @@ 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 {

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
} }