[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    pdh: Fix two missing LeaveCriticalSection() on error paths.
From:       Michael Stefaniuc <mstefani () redhat ! de>
Date:       2007-10-30 20:10:09
Message-ID: 20071030201009.GA21559 () redhat ! com
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


---
 dlls/pdh/pdh_main.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c
index 37613ed..69c12df 100644
--- a/dlls/pdh/pdh_main.c
+++ b/dlls/pdh/pdh_main.c
@@ -407,7 +407,11 @@ PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle )
         WaitForSingleObject( thread, INFINITE );
 
         EnterCriticalSection( &pdh_handle_cs );
-        if (query->magic != PDH_MAGIC_QUERY) return ERROR_SUCCESS;
+        if (query->magic != PDH_MAGIC_QUERY)
+        {
+            LeaveCriticalSection( &pdh_handle_cs );
+            return ERROR_SUCCESS;
+        }
         CloseHandle( query->stop );
         CloseHandle( query->thread );
         query->thread = NULL;
@@ -530,7 +534,11 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND
         WaitForSingleObject( thread, INFINITE );
 
         EnterCriticalSection( &pdh_handle_cs );
-        if (query->magic != PDH_MAGIC_QUERY) return PDH_INVALID_HANDLE;
+        if (query->magic != PDH_MAGIC_QUERY)
+        {
+            LeaveCriticalSection( &pdh_handle_cs );
+            return PDH_INVALID_HANDLE;
+        }
         CloseHandle( query->thread );
         query->thread = NULL;
     }
-- 
1.5.3.4

[Attachment #5 (application/pgp-signature)]



[prev in list] [next in list] [prev in thread] [next in thread]