WIP: Fix null dereference and assumption

andyleejordan · andyleejordan · commit 2d0658a58af2 · 2021-12-14T15:45:28.000-08:00
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs b/src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs
@@ -504,7 +504,7 @@ private void PopPowerShell(RunspaceChangeAction runspaceChangeAction = RunspaceC
             {
                 // If we're changing runspace, make sure we move the handlers over
                 RunspaceFrame previousRunspaceFrame = _runspaceStack.Peek();
-                if (previousRunspaceFrame.Runspace != CurrentPowerShell.Runspace)
+                if (_psFrameStack.Count == 0 || previousRunspaceFrame.Runspace != CurrentPowerShell.Runspace)
                 {
                     _runspaceStack.Pop();
                     RunspaceFrame currentRunspaceFrame = _runspaceStack.Peek();

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ private void PopPowerShell(RunspaceChangeAction runspaceChangeAction = RunspaceC`
`504`	`504`	`{`
`505`	`505`	`// If we're changing runspace, make sure we move the handlers over`
`506`	`506`	`RunspaceFrame previousRunspaceFrame = _runspaceStack.Peek();`
`507`		`- if (previousRunspaceFrame.Runspace != CurrentPowerShell.Runspace)`
	`507`	`+ if (_psFrameStack.Count == 0 \|\| previousRunspaceFrame.Runspace != CurrentPowerShell.Runspace)`
`508`	`508`	`{`
`509`	`509`	`_runspaceStack.Pop();`
`510`	`510`	`RunspaceFrame currentRunspaceFrame = _runspaceStack.Peek();`