diff options
| author | Xinchen Hui <laruence@php.net> | 2012-11-02 18:54:27 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-11-02 18:56:17 +0800 |
| commit | 153bfada90b0733943c31e9d7e2bee57c5e7bcac (patch) | |
| tree | e30fcfc9d2679e9dbda61519772cd95e3c9d7374 | |
| parent | 24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc (diff) | |
| parent | 3fe3029ecb9f121eb6f535970d5cd18ecc8373a6 (diff) | |
| download | php-git-153bfada90b0733943c31e9d7e2bee57c5e7bcac.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.c | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -6,8 +6,10 @@ PHP NEWS . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes). (Tony, Andrew Sitnikov) - . 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) - Curl: . Fixed bug #63363 (Curl silently accepts boolean true for SSL_VERIFYHOST). diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index b40af77c44..c33b599147 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -193,7 +193,7 @@ Finished: TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC) { 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 }; @@ -363,6 +363,9 @@ Finished_Impersonate: } Finished: + if(thread_token != NULL) { + CloseHandle(thread_token); + } if(real_path != NULL) { free(real_path); real_path = NULL; |