fixed use of the process handle after Process instance goes out of scope (pythonnet#1940)

lostmsu · web-flow · commit 4241493468e1 · 2022-09-16T06:08:45.000+02:00
fixes pythonnet#1939
diff --git a/src/runtime/Native/LibraryLoader.cs b/src/runtime/Native/LibraryLoader.cs
@@ -137,17 +137,17 @@ public IntPtr GetFunction(IntPtr hModule, string procedureName)
 
         static IntPtr[] GetAllModules()
         {
-            var self = Process.GetCurrentProcess().Handle;
+            using var self = Process.GetCurrentProcess();
 
             uint bytes = 0;
             var result = new IntPtr[0];
-            if (!EnumProcessModules(self, result, bytes, out var needsBytes))
+            if (!EnumProcessModules(self.Handle, result, bytes, out var needsBytes))
                 throw new Win32Exception();
             while (bytes < needsBytes)
             {
                 bytes = needsBytes;
                 result = new IntPtr[bytes / IntPtr.Size];
-                if (!EnumProcessModules(self, result, bytes, out needsBytes))
+                if (!EnumProcessModules(self.Handle, result, bytes, out needsBytes))
                     throw new Win32Exception();
             }
             return result.Take((int)(needsBytes / IntPtr.Size)).ToArray();

Original file line number	Diff line number	Diff line change
`@@ -137,17 +137,17 @@ public IntPtr GetFunction(IntPtr hModule, string procedureName)`
`137`	`137`
`138`	`138`	`static IntPtr[] GetAllModules()`
`139`	`139`	`{`
`140`		`- var self = Process.GetCurrentProcess().Handle;`
	`140`	`+ using var self = Process.GetCurrentProcess();`
`141`	`141`
`142`	`142`	`uint bytes = 0;`
`143`	`143`	`var result = new IntPtr[0];`
`144`		`- if (!EnumProcessModules(self, result, bytes, out var needsBytes))`
	`144`	`+ if (!EnumProcessModules(self.Handle, result, bytes, out var needsBytes))`
`145`	`145`	`throw new Win32Exception();`
`146`	`146`	`while (bytes < needsBytes)`
`147`	`147`	`{`
`148`	`148`	`bytes = needsBytes;`
`149`	`149`	`result = new IntPtr[bytes / IntPtr.Size];`
`150`		`- if (!EnumProcessModules(self, result, bytes, out needsBytes))`
	`150`	`+ if (!EnumProcessModules(self.Handle, result, bytes, out needsBytes))`
`151`	`151`	`throw new Win32Exception();`
`152`	`152`	`}`
`153`	`153`	`return result.Take((int)(needsBytes / IntPtr.Size)).ToArray();`