gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1948 from bas-vk/rpcfix

Browse Source 
Infinite loop in filters
This commit is contained in:
Jeffrey Wilcke
2015-11-03 15:22:02 +01:00
parent 5ff0814b1f 76410df6a2
commit 6dfbbc3e11
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/api/args_test.go
View File

@@ -1394,13 +1394,10 @@ func TestBlockFilterArgsDefaults(t *testing.T) {
} }
func TestBlockFilterArgsWords(t *testing.T) { func TestBlockFilterArgsWords(t *testing.T) {
input := `[{ input := `[{"fromBlock": "latest", "toBlock": "latest"}]`
"fromBlock": "latest",
"toBlock": "pending"
}]`
expected := new(BlockFilterArgs) expected := new(BlockFilterArgs)
expected.Earliest = -1 expected.Earliest = -1
expected.Latest = -2 expected.Latest = -1
args := new(BlockFilterArgs) args := new(BlockFilterArgs)
if err := json.Unmarshal([]byte(input), &args); err != nil { if err := json.Unmarshal([]byte(input), &args); err != nil {
@@ -1411,8 +1408,9 @@ func TestBlockFilterArgsWords(t *testing.T) {
t.Errorf("Earliest shoud be %#v but is %#v", expected.Earliest, args.Earliest) t.Errorf("Earliest shoud be %#v but is %#v", expected.Earliest, args.Earliest)
} }
if expected.Latest != args.Latest { input = `[{"toBlock": "pending"}]`
t.Errorf("Latest shoud be %#v but is %#v", expected.Latest, args.Latest) if err := json.Unmarshal([]byte(input), &args); err == nil {
t.Errorf("Pending isn't currently supported and should raise an unsupported error")
} }
} }

7
rpc/api/eth_args.go
View File

@@ -722,6 +722,13 @@ func (args *BlockFilterArgs) UnmarshalJSON(b []byte) (err error) {
return err return err
} }
} }
if num == -2 {
return fmt.Errorf("\"pending\" is unsupported")
} else if num < -2 {
return fmt.Errorf("Invalid to block number")
}
args.Latest = num args.Latest = num
if obj[0].Limit == nil { if obj[0].Limit == nil {