From a2dab5b6caaf55e221fbbdea5b021c6d343c0000 Mon Sep 17 00:00:00 2001
From: Chad <chad.d.currie@gmail.com>
Date: Tue, 24 Aug 2021 00:44:48 +1200
Subject: [PATCH] DIspose Process (#10918)

---
 src/Umbraco.Core/Diagnostics/MiniDump.cs      | 28 ++++++++++---------
 src/Umbraco.Core/Persistence/LocalDb.cs       | 17 ++++++-----
 .../Sync/DatabaseServerMessenger.cs           | 10 ++++++-
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Diagnostics/MiniDump.cs b/src/Umbraco.Core/Diagnostics/MiniDump.cs
index e8c2e82f94..ca9596b4ae 100644
--- a/src/Umbraco.Core/Diagnostics/MiniDump.cs
+++ b/src/Umbraco.Core/Diagnostics/MiniDump.cs
@@ -79,24 +79,26 @@ namespace Umbraco.Core.Diagnostics
 
         private static bool Write(SafeHandle fileHandle, Option options, bool withException = false)
         {
-            var currentProcess = Process.GetCurrentProcess();
-            var currentProcessHandle = currentProcess.Handle;
-            var currentProcessId = (uint)currentProcess.Id;
+            using (var currentProcess = Process.GetCurrentProcess())
+            {
+                var currentProcessHandle = currentProcess.Handle;
+                var currentProcessId = (uint)currentProcess.Id;
 
-            MiniDumpExceptionInformation exp;
+                MiniDumpExceptionInformation exp;
 
-            exp.ThreadId = GetCurrentThreadId();
-            exp.ClientPointers = false;
-            exp.ExceptionPointers = IntPtr.Zero;
+                exp.ThreadId = GetCurrentThreadId();
+                exp.ClientPointers = false;
+                exp.ExceptionPointers = IntPtr.Zero;
 
-            if (withException)
-                exp.ExceptionPointers = Marshal.GetExceptionPointers();
+                if (withException)
+                    exp.ExceptionPointers = Marshal.GetExceptionPointers();
 
-            var bRet = exp.ExceptionPointers == IntPtr.Zero
-                ? MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint) options, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero)
-                : MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint) options, ref exp, IntPtr.Zero, IntPtr.Zero);
+                var bRet = exp.ExceptionPointers == IntPtr.Zero
+                    ? MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint)options, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero)
+                    : MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint)options, ref exp, IntPtr.Zero, IntPtr.Zero);
 
-            return bRet;
+                return bRet;
+            }
         }
 
         public static bool Dump(Option options = Option.WithFullMemory, bool withException = false)
diff --git a/src/Umbraco.Core/Persistence/LocalDb.cs b/src/Umbraco.Core/Persistence/LocalDb.cs
index 55d6565344..0e1da4c0d1 100644
--- a/src/Umbraco.Core/Persistence/LocalDb.cs
+++ b/src/Umbraco.Core/Persistence/LocalDb.cs
@@ -901,7 +901,7 @@ namespace Umbraco.Core.Persistence
                 return -1;
             }
 
-            var p = new Process
+            using (var p = new Process
             {
                 StartInfo =
                 {
@@ -913,13 +913,16 @@ namespace Umbraco.Core.Persistence
                     CreateNoWindow = true,
                     WindowStyle = ProcessWindowStyle.Hidden
                 }
-            };
-            p.Start();
-            output = p.StandardOutput.ReadToEnd();
-            error = p.StandardError.ReadToEnd();
-            p.WaitForExit();
+            })
+            {
+                p.Start();
+                output = p.StandardOutput.ReadToEnd();
+                error = p.StandardError.ReadToEnd();
+                p.WaitForExit();
 
-            return p.ExitCode;
+                return p.ExitCode;
+            }
+           
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
index 75ccf5e4f9..1cfca49160 100644
--- a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
+++ b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
@@ -535,10 +535,18 @@ namespace Umbraco.Core.Sync
         /// </remarks>
         protected static readonly string LocalIdentity = NetworkHelper.MachineName // eg DOMAIN\SERVER
             + "/" + HttpRuntime.AppDomainAppId // eg /LM/S3SVC/11/ROOT
-            + " [P" + Process.GetCurrentProcess().Id // eg 1234
+            + " [P" + GetProcessId() // eg 1234
             + "/D" + AppDomain.CurrentDomain.Id // eg 22
             + "] " + Guid.NewGuid().ToString("N").ToUpper(); // make it truly unique
 
+        private static int GetProcessId()
+        {
+            using(var p = Process.GetCurrentProcess())
+            {
+                return p.Id;
+            }
+        }
+
         private string GetDistCacheFilePath(IGlobalSettings globalSettings)
         {
             var fileName = HttpRuntime.AppDomainAppId.ReplaceNonAlphanumericChars(string.Empty) + "-lastsynced.txt";