BAAS-24694: Ensure Object.fromEntries calls are nil-safe (#104)

mongodb-forks · Oct 4, 2023 · dabd75f · dabd75f
1 parent 2bb76f0
commit dabd75f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/builtin_object.go b/builtin_object.go
@@ -584,7 +584,7 @@ func (r *Runtime) object_fromEntries(call FunctionCall) Value {
 		itemObj := r.toObject(nextValue)
 		k := itemObj.self.getIdx(i0, nil)
 		v := itemObj.self.getIdx(i1, nil)
-		key := toPropertyKey(k)
+		key := toPropertyKey(nilSafe(k))
 
 		createDataPropertyOrThrow(result, key, v)
 	})

diff --git a/builtin_object_test.go b/builtin_object_test.go
@@ -274,6 +274,12 @@ func TestObject_fromEntries(t *testing.T) {
  					 [ o.a, o.b, o.c ]
  				 `, "1,true,sea",
 		},
+		{
+			`
+ 					 var o = Object.fromEntries([['a', 1], [, 'empty'], ['b', true]]);
+ 					 [ o.a, o[undefined], o.b ]
+ 				 `, "1,empty,true",
+		},
 	} {
 		actual, err := vm.RunString(tt.js)
 		if err != nil {