Merge aca4164 into d4a9e20

Romout · web-flow · commit c97fd75e0ee0 · 2021-09-15T07:44:16.000Z
diff --git a/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.cpp b/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.cpp
@@ -59,15 +59,13 @@ namespace CefSharp
                 else if (obj->IsArray())
                 {
                     int arrLength = obj->GetArrayLength();
-                    std::vector<CefString> keys;
                     auto array = CefListValue::Create();
-                    if (arrLength > 0 && obj->GetKeys(keys))
+                    if (arrLength > 0)
                     {
                         for (int i = 0; i < arrLength; i++)
                         {
-                            SerializeV8Object(obj->GetValue(keys[i]), array, i, callbackRegistry, seen);
+                            SerializeV8Object(obj->GetValue(i), array, i, callbackRegistry, seen);
                         }
-
                     }
 
                     list->SetList(index, array);
diff --git a/CefSharp.Test/JavascriptBinding/IntegrationTestFacts.cs b/CefSharp.Test/JavascriptBinding/IntegrationTestFacts.cs
@@ -230,5 +230,28 @@ public async Task CanCallCefSharpBindObjectAsyncWithoutParams()
                 Assert.Equal(JavascriptObjectRepository.AllObjects, evt.Arguments.ObjectName);
             }
         }
+
+        [Fact]
+        public async Task CanSerializePartiallyEmptyArrays()
+        {
+            using (var browser = new ChromiumWebBrowser(CefExample.HelloWorldUrl))
+            {
+                var testCases = new[]
+                {
+                    ("[1,2,,5]", new object[] { 1, 2, null, 5 }),
+                    ("[1,2,,]", new object[] { 1, 2, null }),
+                    ("[,2,3]", new object[] { null, 2, 3 }),
+                    ("[,2,,3,,4,,,,5,,,]", new object[] {null, 2, null, 3, null, 4, null, null, null, 5, null, null })
+                };
+                await browser.LoadUrlAsync();
+                foreach (var testCase in testCases)
+                {
+                    var result = await browser.EvaluateScriptAsync(testCase.Item1);
+
+                    Assert.True(result.Success);
+                    Assert.Equal(testCase.Item2, result.Result);
+                }
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,13 @@ namespace CefSharp`
`59`	`59`	`else if (obj->IsArray())`
`60`	`60`	`{`
`61`	`61`	`int arrLength = obj->GetArrayLength();`
`62`		`- std::vector<CefString> keys;`
`63`	`62`	`auto array = CefListValue::Create();`
`64`		`- if (arrLength > 0 && obj->GetKeys(keys))`
	`63`	`+ if (arrLength > 0)`
`65`	`64`	`{`
`66`	`65`	`for (int i = 0; i < arrLength; i++)`
`67`	`66`	`{`
`68`		`- SerializeV8Object(obj->GetValue(keys[i]), array, i, callbackRegistry, seen);`
	`67`	`+ SerializeV8Object(obj->GetValue(i), array, i, callbackRegistry, seen);`
`69`	`68`	`}`
`70`		`-`
`71`	`69`	`}`
`72`	`70`
`73`	`71`	`list->SetList(index, array);`