Diff for /embedaddon/php/TSRM/tsrm_win32.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 12:34:34 version 1.1.1.3, 2013/07/22 01:32:14
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2013 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 193  Finished: Line 193  Finished:
 TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)  TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 {  {
         time_t t;          time_t t;
        HANDLE thread_token;        HANDLE thread_token = NULL;
         PSID token_sid;          PSID token_sid;
         SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;          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 };          GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
Line 363  Finished_Impersonate: Line 363  Finished_Impersonate:
                 }                  }
   
 Finished:  Finished:
                   if(thread_token != NULL) {
                           CloseHandle(thread_token);
                   }
                 if(real_path != NULL) {                  if(real_path != NULL) {
                         free(real_path);                          free(real_path);
                         real_path = NULL;                          real_path = NULL;

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>