Skip to content

Commit 356ef5b

Browse files
committed
Fix CLANG/RELEASE build (this is a workaround for probable bug in CLANG)
1 parent e65f705 commit 356ef5b

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

main/main.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,7 +2424,7 @@ void php_module_shutdown(void)
24242424
/* {{{ php_execute_script */
24252425
PHPAPI int php_execute_script(zend_file_handle *primary_file)
24262426
{
2427-
zend_file_handle *prepend_file_p, *append_file_p;
2427+
zend_file_handle *prepend_file_p = NULL, *append_file_p = NULL;
24282428
zend_file_handle prepend_file, append_file;
24292429
#ifdef HAVE_BROKEN_GETCWD
24302430
volatile int old_cwd_fd = -1;
@@ -2478,15 +2478,11 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file)
24782478
if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) {
24792479
zend_stream_init_filename(&prepend_file, PG(auto_prepend_file));
24802480
prepend_file_p = &prepend_file;
2481-
} else {
2482-
prepend_file_p = NULL;
24832481
}
24842482

24852483
if (PG(auto_append_file) && PG(auto_append_file)[0]) {
24862484
zend_stream_init_filename(&append_file, PG(auto_append_file));
24872485
append_file_p = &append_file;
2488-
} else {
2489-
append_file_p = NULL;
24902486
}
24912487
if (PG(max_input_time) != -1) {
24922488
#ifdef PHP_WIN32

0 commit comments

Comments
 (0)