Fix crash on iconPath access

mjbvz · mjbvz · commit 80ee4aa4a8de · 2018-10-19T11:40:45.000-07:00
Fixes microsoft#61333
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
@@ -72,7 +72,11 @@ export class WebviewEditorInputFactory implements IEditorInputFactory {
 		return this._webviewService.reviveWebview(data.viewType, data.id, data.title, iconPath, data.state, data.options, extensionLocation);
 	}
 }
-function reviveIconPath(data: SerializedIconPath) {
+function reviveIconPath(data: SerializedIconPath | undefined) {
+	if (!data) {
+		return undefined;
+	}
+
 	const light = reviveUri(data.light);
 	const dark = reviveUri(data.dark);
 	return light && dark ? { light, dark } : undefined;

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,11 @@ export class WebviewEditorInputFactory implements IEditorInputFactory {`
`72`	`72`	`return this._webviewService.reviveWebview(data.viewType, data.id, data.title, iconPath, data.state, data.options, extensionLocation);`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`-function reviveIconPath(data: SerializedIconPath) {`
	`75`	`+function reviveIconPath(data: SerializedIconPath \| undefined) {`
	`76`	`+ if (!data) {`
	`77`	`+ return undefined;`
	`78`	`+ }`
	`79`	`+`
`76`	`80`	`const light = reviveUri(data.light);`
`77`	`81`	`const dark = reviveUri(data.dark);`
`78`	`82`	`return light && dark ? { light, dark } : undefined;`