Fix infinite loop after cpptools crashes. (#6604)

sean-mcmanus · sean-mcmanus · commit 2cca5141282d · 2020-12-01T17:25:04.000-08:00
* Fix infinite loop after cpptools crashes: #6603
diff --git a/Extension/src/LanguageServer/clientCollection.ts b/Extension/src/LanguageServer/clientCollection.ts
@@ -91,7 +91,11 @@ export class ClientCollection {
     }
 
     public forEach(callback: (client: cpptools.Client) => void): void {
-        this.languageClients.forEach(callback);
+        // Copy this.languageClients to languageClients to avoid an infinite foreach loop
+        // when callback modifies this.languageClients (e.g. when cpptools crashes).
+        const languageClients: cpptools.Client[] = [];
+        this.languageClients.forEach(client => languageClients.push(client));
+        languageClients.forEach(callback);
     }
 
     public checkOwnership(client: cpptools.Client, document: vscode.TextDocument): boolean {

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,11 @@ export class ClientCollection {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public forEach(callback: (client: cpptools.Client) => void): void {`
`94`		`- this.languageClients.forEach(callback);`
	`94`	`+ // Copy this.languageClients to languageClients to avoid an infinite foreach loop`
	`95`	`+ // when callback modifies this.languageClients (e.g. when cpptools crashes).`
	`96`	`+ const languageClients: cpptools.Client[] = [];`
	`97`	`+ this.languageClients.forEach(client => languageClients.push(client));`
	`98`	`+ languageClients.forEach(callback);`
`95`	`99`	`}`
`96`	`100`
`97`	`101`	`public checkOwnership(client: cpptools.Client, document: vscode.TextDocument): boolean {`