Fixed bug #62444 (Handle leak in is_readable on windows).

laruence · laruence · commit 3fe3029ecb9f · 2012-11-02T18:53:06.000+08:00
diff --git a/NEWS b/NEWS
@@ -3,8 +3,10 @@ PHP                                                                        NEWS
 ?? ??? 2012, PHP 5.3.19
 
 - Core
-  . Fixed bug #63241 PHP fails to open Windows deduplicated files.
+  . Fixed bug #63241 (PHP fails to open Windows deduplicated files).
     (daniel dot stelter-gliese at innogames dot de)
+  . Fixed bug #62444 (Handle leak in is_readable on windows). 
+    (krazyest at seznam dot cz)
 
 - Libxml
   . Fixed bug #63389 (Missing context check on libxml_set_streams_context()
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
@@ -193,7 +193,7 @@ PSID tsrm_win32_get_token_sid(HANDLE hToken)
 TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
 	time_t t;
-	HANDLE thread_token;
+	HANDLE thread_token = NULL;
 	PSID token_sid;
 	SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
 	GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
@@ -365,6 +365,9 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 		}
 
 Finished:
+		if(thread_token != NULL) {
+			CloseHandle(thread_token);
+		}
 		if(real_path != NULL) {
 			free(real_path);
 			real_path = NULL;
