Merge pull request giampaolo#871 from xBeAsTx/bugfix_870

giampaolo · web-flow · commit 266a99da635c · 2016-08-10T17:16:57.000+02:00
giampaolo#870: CloseHandle bugfix
diff --git a/CREDITS b/CREDITS
@@ -394,3 +394,7 @@ I: 816
 N: Jeremy Humble
 W: https://github.com/jhumble
 I: 863
+
+N: Ilya Georgievsky
+W: https://github.com/xBeAsTx
+I: 870
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -16,6 +16,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
   handle unicode service names / descriptions.
 - #869: [Windows] Process.wait() may raise TimeoutExpired with wrong timeout
   unit (ms instead of sec).
+- #870: [Windows] Handle leak inside psutil_get_process_data.
 
 
 4.3.0 - 2016-06-18
diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c
@@ -665,6 +665,8 @@ static int psutil_get_process_data(long pid,
         goto error;
     }
 
+    CloseHandle(hProcess);
+
     *pdata = buffer;
     *psize = size;
 

Original file line number	Diff line number	Diff line change
`@@ -665,6 +665,8 @@ static int psutil_get_process_data(long pid,`
`665`	`665`	`goto error;`
`666`	`666`	`}`
`667`	`667`
	`668`	`+ CloseHandle(hProcess);`
	`669`	`+`
`668`	`670`	`*pdata = buffer;`
`669`	`671`	`*psize = size;`
`670`	`672`