Merge pull request Astn#60 from dawesc/master

Astn · Astn · commit f1f16d8adcf1 · 2016-04-26T12:28:08.000-06:00
When there were too many arguments you'd get an index out of bounds exception
diff --git a/AustinHarris.JsonRpcTestN/Test.cs b/AustinHarris.JsonRpcTestN/Test.cs
@@ -1852,6 +1852,16 @@ public void TestPostProcessOnSession()
             Assert.AreEqual(JObject.Parse(expectedResultAfterDestroy), JObject.Parse(result2.Result));
         }
 
+        [Test()]
+        public void TestExtraParameters()
+        {
+            string request = @"{method:'ReturnsDateTime',params:{extra:'mytext'},id:1}";
+            var result = JsonRpcProcessor.Process(request);
+            result.Wait();
+            Assert.IsTrue(result.Result.Contains("error"));
+            Assert.IsTrue(result.Result.Contains("\"code\":-32602"));
+        }
+
         private static void AssertJsonAreEqual(string expectedJson, string actualJson)
         {
             Newtonsoft.Json.Linq.JObject expected = (Newtonsoft.Json.Linq.JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(expectedJson);
diff --git a/Json-Rpc/Handler.cs b/Json-Rpc/Handler.cs
@@ -261,7 +261,7 @@ public JsonResponse Handle(JsonRequest Rpc, Object RpcContext = null, Action<Jso
                 //    pCount++;
                 //parameters = new object[pCount];
                 var asDict = jo as IDictionary<string, Newtonsoft.Json.Linq.JToken>;
-                for (int i = 0; i < loopCt; i++)
+                for (int i = 0; i < loopCt && i < metadata.parameters.Length; i++)
                 {
                     if (asDict.ContainsKey(metadata.parameters[i].Name) == false)
                     {

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ public JsonResponse Handle(JsonRequest Rpc, Object RpcContext = null, Action<Jso`
`261`	`261`	`// pCount++;`
`262`	`262`	`//parameters = new object[pCount];`
`263`	`263`	`var asDict = jo as IDictionary<string, Newtonsoft.Json.Linq.JToken>;`
`264`		`- for (int i = 0; i < loopCt; i++)`
	`264`	`+ for (int i = 0; i < loopCt && i < metadata.parameters.Length; i++)`
`265`	`265`	`{`
`266`	`266`	`if (asDict.ContainsKey(metadata.parameters[i].Name) == false)`
`267`	`267`	`{`