Fix exception catching regression

PowerShell · Apr 7, 2021 · caf86e5 · caf86e5
1 parent 2dadda3
commit caf86e5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/src/System.Management.Automation/engine/CommandProcessor.cs b/src/System.Management.Automation/engine/CommandProcessor.cs
@@ -324,7 +324,7 @@ internal override void ProcessRecord()
                         Command.DoBeginProcessing();
                     }
                 }
-                catch (Exception e) when (ShallWrapBeforeBubbleUp(e))
+                catch (Exception e)
                 {
                     // This cmdlet threw an exception, so wrap it and bubble it up.
                     throw ManageInvocationException(e);
@@ -394,7 +394,13 @@ internal override void ProcessRecord()
 
                     exceptionToThrow = rte;
                 }
-                catch (Exception e) when (ShallWrapBeforeBubbleUp(e))
+                catch (LoopFlowException)
+                {
+                    // Don't wrap LoopFlowException, we incorrectly raise a PipelineStoppedException
+                    // which gets caught by a script try/catch if we wrap here.
+                    throw;
+                }
+                catch (Exception e)
                 {
                     // Catch-all OK, 3rd party callout.
                     exceptionToThrow = e;

diff --git a/src/System.Management.Automation/engine/CommandProcessorBase.cs b/src/System.Management.Automation/engine/CommandProcessorBase.cs
@@ -536,7 +536,7 @@ internal virtual void DoBegin()
                         Command.DoBeginProcessing();
                     }
                 }
-                catch (Exception e) when (ShallWrapBeforeBubbleUp(e))
+                catch (Exception e)
                 {
                     // This cmdlet threw an exception, so
                     // wrap it and bubble it up.
@@ -580,12 +580,6 @@ internal void DoExecute()
             }
         }
 
-        protected bool ShallWrapBeforeBubbleUp(Exception e)
-        {
-            return e is not FlowControlException
-                && e is not HaltCommandException;
-        }
-
         /// <summary>
         /// Called once after ProcessRecord().
         /// Internally it calls EndProcessing() of the InternalCommand.
@@ -606,7 +600,7 @@ internal virtual void Complete()
                     this.Command.DoEndProcessing();
                 }
             }
-            catch (Exception e) when (ShallWrapBeforeBubbleUp(e))
+            catch (Exception e)
             {
                 // This cmdlet threw an exception, wrap it as needed and bubble it up.
                 throw ManageInvocationException(e);
@@ -665,7 +659,15 @@ protected virtual void CleanResource()
                     this.Command.DoCleanResource();
                 }
             }
-            catch (Exception e) when (ShallWrapBeforeBubbleUp(e))
+            catch (HaltCommandException)
+            {
+                throw;
+            }
+            catch (FlowControlException)
+            {
+                throw;
+            }
+            catch (Exception e)
             {
                 // This cmdlet threw an exception, so wrap it and bubble it up.
                 throw ManageInvocationException(e);

diff --git a/src/System.Management.Automation/engine/ScriptCommandProcessor.cs b/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
@@ -607,12 +607,16 @@ private void RunClause(Action<FunctionContext> clause, object dollarUnderbar, ob
                 if (exitCode != 0)
                     this.commandRuntime.PipelineProcessor.ExecutionFailed = true;
             }
+            catch (FlowControlException)
+            {
+                throw;
+            }
             catch (RuntimeException e)
             {
                 // This method always throws.
                 ManageScriptException(e);
             }
-            catch (Exception e) when (ShallWrapBeforeBubbleUp(e))
+            catch (Exception e)
             {
                 // This cmdlet threw an exception, so wrap it and bubble it up.
                 throw ManageInvocationException(e);