fix bug #50101 (name clash between global and local variable)

diff --git a/NEWS b/NEWS
index 096131b22755c3ccd5b703724ad0205af1844786..d1247bbe76c99f90107382a9180776aecfeb126b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -171,6 +171,8 @@ PHP                                                                        NEWS
 - Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include
   file and line in trace). (Felipe)
 - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
+- Fixed bug #50101 (name clash between global and local variable).
+  (patch by yoarvi at gmail dot com)
 - Fixed bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3).
   (Dmitry)
 - Fixed bug #49819 (STDOUT losing data with posix_isatty()). (Mike)

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 3ccc729fc6f786ffbdf200bdf4eef9c7297f1689..d51e01aa3ea125978b2c0d83f40de6bde086f490 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -298,19 +298,19 @@ static int php_is_file_ok(const cwd_state *state)  /* {{{ */
 }
 /* }}} */
 
-static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC) /* {{{ */
+static void cwd_globals_ctor(virtual_cwd_globals *cwd_g TSRMLS_DC) /* {{{ */
 {
-       CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state);
-       cwd_globals->realpath_cache_size = 0;
-       cwd_globals->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
-       cwd_globals->realpath_cache_ttl = REALPATH_CACHE_TTL;
-       memset(cwd_globals->realpath_cache, 0, sizeof(cwd_globals->realpath_cache));
+       CWD_STATE_COPY(&cwd_g->cwd, &main_cwd_state);
+       cwd_g->realpath_cache_size = 0;
+       cwd_g->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
+       cwd_g->realpath_cache_ttl = REALPATH_CACHE_TTL;
+       memset(cwd_g->realpath_cache, 0, sizeof(cwd_g->realpath_cache));
 }
 /* }}} */
 
-static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC) /* {{{ */
+static void cwd_globals_dtor(virtual_cwd_globals *cwd_g TSRMLS_DC) /* {{{ */
 {
-       CWD_STATE_FREE(&cwd_globals->cwd);
+       CWD_STATE_FREE(&cwd_g->cwd);
        realpath_cache_clean(TSRMLS_C);
 }
 /* }}} */