Merge pull request #39 from fsbflavio/fix-deadlock-psi

fix possibility of dead lock in ProcessStart
ModernRonin · Sep 24, 2022 · 99eea45 · 99eea45
2 parents 99e5e3d + b6cf407
commit 99eea45
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ModernRonin.ProjectRenamer/Executor.cs b/ModernRonin.ProjectRenamer/Executor.cs
@@ -26,7 +26,7 @@ public string ToolRead(string tool, string arguments, Action onNonZeroExitCode)
         {
             var result = string.Empty;
             _runtime.DoWithTool(tool, arguments, onNonZeroExitCode, psi => psi.RedirectStandardOutput = true,
-                p => result = p.StandardOutput.ReadToEnd());
+                p => result = p);
             return result;
         }
     }

diff --git a/ModernRonin.ProjectRenamer/IRuntime.cs b/ModernRonin.ProjectRenamer/IRuntime.cs
@@ -11,6 +11,6 @@ void DoWithTool(string tool,
             string arguments,
             Action onNonZeroExitCode,
             Action<ProcessStartInfo> configure,
-            Action<Process> onSuccess);
+            Action<string> onSuccess);
     }
 }
diff --git a/ModernRonin.ProjectRenamer/Runtime.cs b/ModernRonin.ProjectRenamer/Runtime.cs
@@ -17,7 +17,7 @@ public void DoWithTool(string tool,
             string arguments,
             Action onNonZeroExitCode,
             Action<ProcessStartInfo> configure,
-            Action<Process> onSuccess)
+            Action<string> onSuccess)
         {
             var psi = new ProcessStartInfo
             {
@@ -30,9 +30,13 @@ public void DoWithTool(string tool,
             try
             {
                 var process = Process.Start(psi);
+                string output = "";
+                if (psi.RedirectStandardOutput)
+                    output = process.StandardOutput.ReadToEnd();
+
                 process.WaitForExit();
                 if (process.ExitCode != 0) onNonZeroExitCode();
-                else onSuccess(process);
+                else onSuccess(output);
             }
             catch (Win32Exception)
             {