Skip to content

Commit 20d1d23

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
2 parents 8a1f7fa + e488f7b commit 20d1d23

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,9 +2204,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
22042204

22052205
/* see bug #15471 (old BTS) */
22062206
if (persistent_script->script.filename) {
2207-
if (!EG(current_execute_data) || !EG(current_execute_data)->opline ||
2207+
if (!EG(current_execute_data) ||
22082208
!EG(current_execute_data)->func ||
22092209
!ZEND_USER_CODE(EG(current_execute_data)->func->common.type) ||
2210+
!EG(current_execute_data)->opline ||
22102211
EG(current_execute_data)->opline->opcode != ZEND_INCLUDE_OR_EVAL ||
22112212
(EG(current_execute_data)->opline->extended_value != ZEND_INCLUDE_ONCE &&
22122213
EG(current_execute_data)->opline->extended_value != ZEND_REQUIRE_ONCE)) {

0 commit comments

Comments
 (0)