Fixed panic in newArrayFromIter when the iterator is already closed. F…

…ixes dop251#375
mongodb-forks · Mar 24, 2022 · a18ffb9 · a18ffb9
1 parent b09a6bf
commit a18ffb9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/vm.go b/vm.go
@@ -1842,9 +1842,11 @@ func (_newArrayFromIter) exec(vm *vm) {
 	iter := vm.iterStack[l].iter
 	vm.iterStack[l] = iterStackItem{}
 	vm.iterStack = vm.iterStack[:l]
-	iter.iterate(func(val Value) {
-		values = append(values, val)
-	})
+	if iter.iterator != nil {
+		iter.iterate(func(val Value) {
+			values = append(values, val)
+		})
+	}
 	vm.push(vm.r.newArrayValues(values))
 	vm.pc++
 }

diff --git a/vm_test.go b/vm_test.go
@@ -80,6 +80,16 @@ func TestResolveMixedStack1(t *testing.T) {
 	testScript(SCRIPT, valueInt(42), t)
 }
 
+func TestNewArrayFromIterClosed(t *testing.T) {
+	const SCRIPT = `
+	const [a, ...other] = [];
+	assert.sameValue(a, undefined);
+	assert(Array.isArray(other));
+	assert.sameValue(other.length, 0);
+	`
+	testScriptWithTestLib(SCRIPT, _undefined, t)
+}
+
 func BenchmarkVmNOP2(b *testing.B) {
 	prg := []func(*vm){
 		//loadVal(0).exec,