archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

sapi: Fix some variable shadowing (#16485)

Browse source 
sapi_module, mime_type_map, zend_extensions, php_cgi_globals, and phpdbg_globals are true globals which are being shadowed
This commit is contained in:
Gina Peter Banyard 2024-10-17 22:46:23 +01:00 • committed by GitHub
parent b6f59d2a6b
commit 6ddab74d55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 66 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

32
sapi/cgi/cgi_main.c
View file

@ -968,9 +968,9 @@ static int sapi_cgi_deactivate(void)
return SUCCESS; return SUCCESS;
} }
static int php_cgi_startup(sapi_module_struct *sapi_module) static int php_cgi_startup(sapi_module_struct *sapi_module_ptr)
{ {
return php_module_startup(sapi_module, &cgi_module_entry); return php_module_startup(sapi_module_ptr, &cgi_module_entry);
} }
/* {{{ sapi_module_struct cgi_sapi_module */ /* {{{ sapi_module_struct cgi_sapi_module */
@ -1518,23 +1518,23 @@ PHP_INI_BEGIN()
PHP_INI_END() PHP_INI_END()
/* {{{ php_cgi_globals_ctor */ /* {{{ php_cgi_globals_ctor */
static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals) static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals_ptr)
{ {
#if defined(ZTS) && defined(PHP_WIN32) #if defined(ZTS) && defined(PHP_WIN32)
ZEND_TSRMLS_CACHE_UPDATE(); ZEND_TSRMLS_CACHE_UPDATE();
#endif #endif
php_cgi_globals->rfc2616_headers = 0; php_cgi_globals_ptr->rfc2616_headers = 0;
php_cgi_globals->nph = 0; php_cgi_globals_ptr->nph = 0;
php_cgi_globals->check_shebang_line = 1; php_cgi_globals_ptr->check_shebang_line = 1;
php_cgi_globals->force_redirect = 1; php_cgi_globals_ptr->force_redirect = 1;
php_cgi_globals->redirect_status_env = NULL; php_cgi_globals_ptr->redirect_status_env = NULL;
php_cgi_globals->fix_pathinfo = 1; php_cgi_globals_ptr->fix_pathinfo = 1;
php_cgi_globals->discard_path = 0; php_cgi_globals_ptr->discard_path = 0;
php_cgi_globals->fcgi_logging = 1; php_cgi_globals_ptr->fcgi_logging = 1;
#ifdef PHP_WIN32 #ifdef PHP_WIN32
php_cgi_globals->impersonate = 0; php_cgi_globals_ptr->impersonate = 0;
#endif #endif
zend_hash_init(&php_cgi_globals->user_config_cache, 8, NULL, user_config_cache_entry_dtor, 1); zend_hash_init(&php_cgi_globals_ptr->user_config_cache, 8, NULL, user_config_cache_entry_dtor, 1);
} }
/* }}} */ /* }}} */
@ -2548,11 +2548,11 @@ do_repeat:
break; break;
case PHP_MODE_HIGHLIGHT: case PHP_MODE_HIGHLIGHT:
{ {
zend_syntax_highlighter_ini syntax_highlighter_ini; zend_syntax_highlighter_ini default_syntax_highlighter_ini;
if (open_file_for_scanning(&file_handle) == SUCCESS) { if (open_file_for_scanning(&file_handle) == SUCCESS) {
php_get_highlight_struct(&syntax_highlighter_ini); php_get_highlight_struct(&default_syntax_highlighter_ini);
zend_highlight(&syntax_highlighter_ini); zend_highlight(&default_syntax_highlighter_ini);
} }
} }
break; break;

38
sapi/cli/php_cli.c
View file

@ -392,9 +392,9 @@ static void sapi_cli_send_header(sapi_header_struct *sapi_header, void *server_c
} }
/* }}} */ /* }}} */
static int php_cli_startup(sapi_module_struct *sapi_module) /* {{{ */ static int php_cli_startup(sapi_module_struct *sapi_module_ptr) /* {{{ */
{ {
return php_module_startup(sapi_module, NULL); return php_module_startup(sapi_module_ptr, NULL);
} }
/* }}} */ /* }}} */
@ -951,11 +951,11 @@ do_repeat:
break; break;
case PHP_CLI_MODE_HIGHLIGHT: case PHP_CLI_MODE_HIGHLIGHT:
{ {
zend_syntax_highlighter_ini syntax_highlighter_ini; zend_syntax_highlighter_ini default_syntax_highlighter_ini;
if (open_file_for_scanning(&file_handle) == SUCCESS) { if (open_file_for_scanning(&file_handle) == SUCCESS) {
php_get_highlight_struct(&syntax_highlighter_ini); php_get_highlight_struct(&default_syntax_highlighter_ini);
zend_highlight(&syntax_highlighter_ini); zend_highlight(&default_syntax_highlighter_ini);
} }
goto out; goto out;
} }
@ -1155,7 +1155,7 @@ int main(int argc, char *argv[])
char *ini_path_override = NULL; char *ini_path_override = NULL;
struct php_ini_builder ini_builder; struct php_ini_builder ini_builder;
int ini_ignore = 0; int ini_ignore = 0;
sapi_module_struct *sapi_module = &cli_sapi_module; sapi_module_struct *sapi_module_ptr = &cli_sapi_module;
/* /*
* Do not move this initialization. It needs to happen before argv is used * Do not move this initialization. It needs to happen before argv is used
@ -1234,7 +1234,7 @@ int main(int argc, char *argv[])
break; break;
#ifndef PHP_CLI_WIN32_NO_CONSOLE #ifndef PHP_CLI_WIN32_NO_CONSOLE
case 'S': case 'S':
sapi_module = &cli_server_sapi_module; sapi_module_ptr = &cli_server_sapi_module;
cli_server_sapi_module.additional_functions = server_additional_functions; cli_server_sapi_module.additional_functions = server_additional_functions;
break; break;
#endif #endif
@ -1247,7 +1247,7 @@ int main(int argc, char *argv[])
exit_status = 1; exit_status = 1;
goto out; goto out;
case 'i': case 'v': case 'm': case 'i': case 'v': case 'm':
sapi_module = &cli_sapi_module; sapi_module_ptr = &cli_sapi_module;
goto exit_loop; goto exit_loop;
case 'e': /* enable extended info output */ case 'e': /* enable extended info output */
use_extended_info = 1; use_extended_info = 1;
@ -1256,25 +1256,25 @@ int main(int argc, char *argv[])
} }
exit_loop: exit_loop:
sapi_module->ini_defaults = sapi_cli_ini_defaults; sapi_module_ptr->ini_defaults = sapi_cli_ini_defaults;
sapi_module->php_ini_path_override = ini_path_override; sapi_module_ptr->php_ini_path_override = ini_path_override;
sapi_module->phpinfo_as_text = 1; sapi_module_ptr->phpinfo_as_text = 1;
sapi_module->php_ini_ignore_cwd = 1; sapi_module_ptr->php_ini_ignore_cwd = 1;
sapi_startup(sapi_module); sapi_startup(sapi_module_ptr);
sapi_started = 1; sapi_started = 1;
sapi_module->php_ini_ignore = ini_ignore; sapi_module_ptr->php_ini_ignore = ini_ignore;
sapi_module->executable_location = argv[0]; sapi_module_ptr->executable_location = argv[0];
if (sapi_module == &cli_sapi_module) { if (sapi_module_ptr == &cli_sapi_module) {
php_ini_builder_prepend_literal(&ini_builder, HARDCODED_INI); php_ini_builder_prepend_literal(&ini_builder, HARDCODED_INI);
} }
sapi_module->ini_entries = php_ini_builder_finish(&ini_builder); sapi_module_ptr->ini_entries = php_ini_builder_finish(&ini_builder);
/* startup after we get the above ini override so we get things right */ /* startup after we get the above ini override so we get things right */
if (sapi_module->startup(sapi_module) == FAILURE) { if (sapi_module_ptr->startup(sapi_module_ptr) == FAILURE) {
/* there is no way to see if we must call zend_ini_deactivate() /* there is no way to see if we must call zend_ini_deactivate()
* since we cannot check if EG(ini_directives) has been initialized * since we cannot check if EG(ini_directives) has been initialized
* because the executor's constructor does not set initialize it. * because the executor's constructor does not set initialize it.
@ -1305,7 +1305,7 @@ exit_loop:
zend_first_try { zend_first_try {
#ifndef PHP_CLI_WIN32_NO_CONSOLE #ifndef PHP_CLI_WIN32_NO_CONSOLE
if (sapi_module == &cli_sapi_module) { if (sapi_module_ptr == &cli_sapi_module) {
#endif #endif
exit_status = do_cli(argc, argv); exit_status = do_cli(argc, argv);
#ifndef PHP_CLI_WIN32_NO_CONSOLE #ifndef PHP_CLI_WIN32_NO_CONSOLE

10
sapi/cli/php_cli_server.c
View file

@ -510,9 +510,9 @@ const zend_function_entry server_additional_functions[] = {
PHP_FE_END PHP_FE_END
}; };
static int sapi_cli_server_startup(sapi_module_struct *sapi_module) /* {{{ */ static int sapi_cli_server_startup(sapi_module_struct *sapi_module_ptr) /* {{{ */
{ {
return php_module_startup(sapi_module, &cli_server_module_entry); return php_module_startup(sapi_module_ptr, &cli_server_module_entry);
} /* }}} */ } /* }}} */
static size_t sapi_cli_server_ub_write(const char *str, size_t str_length) /* {{{ */ static size_t sapi_cli_server_ub_write(const char *str, size_t str_length) /* {{{ */
@ -2353,14 +2353,14 @@ static zend_result php_cli_server_dispatch(php_cli_server *server, php_cli_serve
} }
/* }}} */ /* }}} */
static void php_cli_server_mime_type_ctor(php_cli_server *server, const php_cli_server_ext_mime_type_pair *mime_type_map) /* {{{ */ static void php_cli_server_mime_type_ctor(php_cli_server *server, const php_cli_server_ext_mime_type_pair *mime_type_map_ptr) /* {{{ */
{ {
const php_cli_server_ext_mime_type_pair *pair; const php_cli_server_ext_mime_type_pair *pair;
zend_hash_init(&server->extension_mime_types, 0, NULL, NULL, 1); zend_hash_init(&server->extension_mime_types, 0, NULL, NULL, 1);
GC_MAKE_PERSISTENT_LOCAL(&server->extension_mime_types); GC_MAKE_PERSISTENT_LOCAL(&server->extension_mime_types);
for (pair = mime_type_map; pair->ext; pair++) { for (pair = mime_type_map_ptr; pair->ext; pair++) {
size_t ext_len = strlen(pair->ext); size_t ext_len = strlen(pair->ext);
zend_hash_str_add_ptr(&server->extension_mime_types, pair->ext, ext_len, (void*)pair->mime_type); zend_hash_str_add_ptr(&server->extension_mime_types, pair->ext, ext_len, (void*)pair->mime_type);
} }
@ -2396,7 +2396,7 @@ static void php_cli_server_dtor(php_cli_server *server) /* {{{ */
do { do {
if (waitpid(php_cli_server_workers[php_cli_server_worker], if (waitpid(php_cli_server_workers[php_cli_server_worker],
&php_cli_server_worker_status, &php_cli_server_worker_status,
0) == FAILURE) { 0) == (pid_t) -1) {
/* an extremely bad thing happened */ /* an extremely bad thing happened */
break; break;
} }

28
sapi/phpdbg/phpdbg.c
View file

@ -1124,8 +1124,8 @@ int main(int argc, char **argv) /* {{{ */
sapi_module_struct *phpdbg = &phpdbg_sapi_module; sapi_module_struct *phpdbg = &phpdbg_sapi_module;
char *sapi_name; char *sapi_name;
struct php_ini_builder ini_builder; struct php_ini_builder ini_builder;
char **zend_extensions = NULL; char **zend_extensions_list = NULL;
zend_ulong zend_extensions_len = 0L; size_t zend_extensions_len = 0;
bool ini_ignore; bool ini_ignore;
char *ini_override; char *ini_override;
char *exec = NULL; char *exec = NULL;
@ -1177,8 +1177,6 @@ phpdbg_main:
php_ini_builder_init(&ini_builder); php_ini_builder_init(&ini_builder);
ini_ignore = 0; ini_ignore = 0;
ini_override = NULL; ini_override = NULL;
zend_extensions = NULL;
zend_extensions_len = 0L;
init_file = NULL; init_file = NULL;
init_file_len = 0; init_file_len = 0;
init_file_default = 1; init_file_default = 1;
@ -1216,10 +1214,12 @@ phpdbg_main:
case 'z': case 'z':
zend_extensions_len++; zend_extensions_len++;
if (zend_extensions) { if (zend_extensions_list) {
zend_extensions = realloc(zend_extensions, sizeof(char*) * zend_extensions_len); zend_extensions_list = realloc(zend_extensions_list, sizeof(char*) * zend_extensions_len);
} else zend_extensions = malloc(sizeof(char*) * zend_extensions_len); } else {
zend_extensions[zend_extensions_len-1] = strdup(php_optarg); zend_extensions_list = malloc(sizeof(char*) * zend_extensions_len);
}
zend_extensions_list[zend_extensions_len-1] = strdup(php_optarg);
break; break;
/* begin phpdbg options */ /* begin phpdbg options */
@ -1316,19 +1316,19 @@ phpdbg_main:
php_ini_builder_prepend_literal(&ini_builder, phpdbg_ini_hardcoded); php_ini_builder_prepend_literal(&ini_builder, phpdbg_ini_hardcoded);
if (zend_extensions_len) { if (zend_extensions_len) {
zend_ulong zend_extension = 0L; size_t zend_extension_index = 0;
while (zend_extension < zend_extensions_len) { while (zend_extension_index < zend_extensions_len) {
const char *ze = zend_extensions[zend_extension]; const char *ze = zend_extensions_list[zend_extension_index];
size_t ze_len = strlen(ze); size_t ze_len = strlen(ze);
php_ini_builder_unquoted(&ini_builder, "zend_extension", strlen("zend_extension"), ze, ze_len); php_ini_builder_unquoted(&ini_builder, "zend_extension", strlen("zend_extension"), ze, ze_len);
free(zend_extensions[zend_extension]); free(zend_extensions_list[zend_extension_index]);
zend_extension++; zend_extension_index++;
} }
free(zend_extensions); free(zend_extensions_list);
} }
phpdbg->ini_entries = php_ini_builder_finish(&ini_builder); phpdbg->ini_entries = php_ini_builder_finish(&ini_builder);

2
sapi/phpdbg/phpdbg.h
View file

@ -193,8 +193,10 @@ int phpdbg_do_parse(phpdbg_param_t *stack, char *input);
#define phpdbg_try_access \ #define phpdbg_try_access \
{ \ { \
ZEND_DIAGNOSTIC_IGNORED_START("-Wshadow") \
JMP_BUF *__orig_bailout = PHPDBG_G(sigsegv_bailout); \ JMP_BUF *__orig_bailout = PHPDBG_G(sigsegv_bailout); \
JMP_BUF __bailout; \ JMP_BUF __bailout; \
ZEND_DIAGNOSTIC_IGNORED_END \
\ \
PHPDBG_G(sigsegv_bailout) = &__bailout; \ PHPDBG_G(sigsegv_bailout) = &__bailout; \
if (SETJMP(__bailout) == 0) { if (SETJMP(__bailout) == 0) {

16
sapi/phpdbg/phpdbg_bp.c
View file

@ -1510,28 +1510,28 @@ PHPDBG_API void phpdbg_print_breakpoints(zend_ulong type) /* {{{ */
phpdbg_out(SEPARATE "\n"); phpdbg_out(SEPARATE "\n");
phpdbg_out("Opline Breakpoints:\n"); phpdbg_out("Opline Breakpoints:\n");
ZEND_HASH_MAP_FOREACH_PTR(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE], brake) { ZEND_HASH_MAP_FOREACH_PTR(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE], brake) {
const char *type; const char *str_type;
switch (brake->type) { switch (brake->type) {
case PHPDBG_BREAK_METHOD_OPLINE: case PHPDBG_BREAK_METHOD_OPLINE:
type = "method"; str_type = "method";
goto print_opline; goto print_opline;
case PHPDBG_BREAK_FUNCTION_OPLINE: case PHPDBG_BREAK_FUNCTION_OPLINE:
type = "function"; str_type = "function";
goto print_opline; goto print_opline;
case PHPDBG_BREAK_FILE_OPLINE: case PHPDBG_BREAK_FILE_OPLINE:
type = "method"; str_type = "method";
print_opline: { print_opline: {
if (brake->type == PHPDBG_BREAK_METHOD_OPLINE) { if (brake->type == PHPDBG_BREAK_METHOD_OPLINE) {
type = "method"; str_type = "method";
} else if (brake->type == PHPDBG_BREAK_FUNCTION_OPLINE) { } else if (brake->type == PHPDBG_BREAK_FUNCTION_OPLINE) {
type = "function"; str_type = "function";
} else if (brake->type == PHPDBG_BREAK_FILE_OPLINE) { } else if (brake->type == PHPDBG_BREAK_FILE_OPLINE) {
type = "file"; str_type = "file";
} }
phpdbg_writeln("#%d\t\t#"ZEND_ULONG_FMT"\t\t(%s breakpoint)%s", phpdbg_writeln("#%d\t\t#"ZEND_ULONG_FMT"\t\t(%s breakpoint)%s",
brake->id, brake->opline, type, brake->id, brake->opline, str_type,
((phpdbg_breakbase_t *) brake)->disabled ? " [disabled]" : ""); ((phpdbg_breakbase_t *) brake)->disabled ? " [disabled]" : "");
} break; } break;

4
sapi/phpdbg/phpdbg_watch.c
View file

@ -310,9 +310,9 @@ int phpdbg_watchpoint_segfault_handler(siginfo_t *info, void *context) {
# if defined(__GNUC__) && !defined(__clang__) # if defined(__GNUC__) && !defined(__clang__)
__attribute__((no_sanitize_address)) __attribute__((no_sanitize_address))
# endif # endif
void *phpdbg_watchpoint_userfaultfd_thread(void *phpdbg_globals) { void *phpdbg_watchpoint_userfaultfd_thread(void *phpdbg_globals_ptr) {
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
zend_phpdbg_globals *globals = (zend_phpdbg_globals *) phpdbg_globals; zend_phpdbg_globals *globals = (zend_phpdbg_globals *) phpdbg_globals_ptr;
struct uffd_msg fault_msg = {0}; struct uffd_msg fault_msg = {0};
while (read(globals->watch_userfaultfd, &fault_msg, sizeof(fault_msg)) == sizeof(fault_msg)) { while (read(globals->watch_userfaultfd, &fault_msg, sizeof(fault_msg)) == sizeof(fault_msg)) {