summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2021-03-17 15:50:36 +0300
committerDmitry Stogov <dmitry@zend.com>2021-03-17 15:50:36 +0300
commit356ef5bd0e871d58c274110d3689870b8cb264b9 (patch)
treef9af82bd33a76437f40f7c130395a31c90f0b8d5 /main
parente65f705ce363bafe3067c47a18300f28b61dd3f5 (diff)
downloadphp-git-356ef5bd0e871d58c274110d3689870b8cb264b9.tar.gz
Fix CLANG/RELEASE build (this is a workaround for probable bug in CLANG)
Diffstat (limited to 'main')
-rw-r--r--main/main.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/main/main.c b/main/main.c
index a32c89739f..fabff08bc5 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2424,7 +2424,7 @@ void php_module_shutdown(void)
/* {{{ php_execute_script */
PHPAPI int php_execute_script(zend_file_handle *primary_file)
{
- zend_file_handle *prepend_file_p, *append_file_p;
+ zend_file_handle *prepend_file_p = NULL, *append_file_p = NULL;
zend_file_handle prepend_file, append_file;
#ifdef HAVE_BROKEN_GETCWD
volatile int old_cwd_fd = -1;
@@ -2478,15 +2478,11 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file)
if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) {
zend_stream_init_filename(&prepend_file, PG(auto_prepend_file));
prepend_file_p = &prepend_file;
- } else {
- prepend_file_p = NULL;
}
if (PG(auto_append_file) && PG(auto_append_file)[0]) {
zend_stream_init_filename(&append_file, PG(auto_append_file));
append_file_p = &append_file;
- } else {
- append_file_p = NULL;
}
if (PG(max_input_time) != -1) {
#ifdef PHP_WIN32