development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent dispose cycles

Browse source 
For #75304

Make sure we do not get into a loop of tyring to dispose of an object by checking `isDisposed` before calling into dispose again

Also log if you try to register a disposeable on itself
This commit is contained in:
Matt Bierner 2019-06-11 16:48:55 -07:00
parent af39a4d4fb
commit 9c14fecc87
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/base/common/lifecycle.ts
View file

@ -93,6 +93,10 @@ export class DisposableStore implements IDisposable {
* Any future disposables added to this object will be disposed of on `add`.
*/
public dispose(): void {
if (this._isDisposed) {
return;
}
markTracked(this);
this._isDisposed = true;
this.clear();
@ -110,6 +114,9 @@ export class DisposableStore implements IDisposable {
if (!t) {
return t;
}
if ((t as any as DisposableStore) === this) {
throw new Error('Cannot register a disposable on itself!');
}
markTracked(t);
if (this._isDisposed) {
@ -140,6 +147,9 @@ export abstract class Disposable implements IDisposable {
}
protected _register<T extends IDisposable>(t: T): T {
if ((t as any as Disposable) === this) {
throw new Error('Cannot register a disposable on itself!');
}
return this._store.add(t);
}
}