Fix webview deserialization potential crash

mjbvz · mjbvz · commit 5b98f71146bf · 2019-02-13T10:47:56.000-08:00
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
@@ -333,7 +333,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		}
 
 		const webview = new ExtHostWebview(webviewHandle, this._proxy, options);
-		const revivedPanel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, typeof position === 'number' ? typeConverters.ViewColumn.to(position) : undefined, options, webview);
+		const revivedPanel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, typeof position === 'number' && position >= 0 ? typeConverters.ViewColumn.to(position) : undefined, options, webview);
 		this._webviewPanels.set(webviewHandle, revivedPanel);
 		return Promise.resolve(serializer.deserializeWebviewPanel(revivedPanel, state));
 	}

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`const webview = new ExtHostWebview(webviewHandle, this._proxy, options);`
`336`		`- const revivedPanel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, typeof position === 'number' ? typeConverters.ViewColumn.to(position) : undefined, options, webview);`
	`336`	`+ const revivedPanel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, typeof position === 'number' && position >= 0 ? typeConverters.ViewColumn.to(position) : undefined, options, webview);`
`337`	`337`	`this._webviewPanels.set(webviewHandle, revivedPanel);`
`338`	`338`	`return Promise.resolve(serializer.deserializeWebviewPanel(revivedPanel, state));`
`339`	`339`	`}`