Merge pull request #1948 from bas-vk/rpcfix

Infinite loop in filters

2 files changed, 12 insertions, 7 deletions

diff --git a/rpc/api/args_test.go b/rpc/api/args_test.go
index 23ae2930d..130315bd9 100644
--- a/rpc/api/args_test.go
+++ b/rpc/api/args_test.go
@@ -1394,13 +1394,10 @@ func TestBlockFilterArgsDefaults(t *testing.T) {
 }
 
 func TestBlockFilterArgsWords(t *testing.T) {
-	input := `[{
-  "fromBlock": "latest",
-  "toBlock": "pending"
-  }]`
+	input := `[{"fromBlock": "latest", "toBlock": "latest"}]`
 	expected := new(BlockFilterArgs)
 	expected.Earliest = -1
-	expected.Latest = -2
+	expected.Latest = -1
 
 	args := new(BlockFilterArgs)
 	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)
 	}
 
-	if expected.Latest != args.Latest {
-		t.Errorf("Latest shoud be %#v but is %#v", expected.Latest, args.Latest)
+	input = `[{"toBlock": "pending"}]`
+	if err := json.Unmarshal([]byte(input), &args); err == nil {
+		t.Errorf("Pending isn't currently supported and should raise an unsupported error")
 	}
 }
 
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 457350d74..ed3d761f1 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -722,6 +722,13 @@ func (args *BlockFilterArgs) UnmarshalJSON(b []byte) (err error) {
 			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
 
 	if obj[0].Limit == nil {