Skip to content

Commit e488f7b

Browse files
committed
Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
1 parent 0451ede commit e488f7b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ext/opcache/ZendAccelerator.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -2214,9 +2214,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
22142214

22152215
/* see bug #15471 (old BTS) */
22162216
if (persistent_script->script.filename) {
2217-
if (!EG(current_execute_data) || !EG(current_execute_data)->opline ||
2217+
if (!EG(current_execute_data) ||
22182218
!EG(current_execute_data)->func ||
22192219
!ZEND_USER_CODE(EG(current_execute_data)->func->common.type) ||
2220+
!EG(current_execute_data)->opline ||
22202221
EG(current_execute_data)->opline->opcode != ZEND_INCLUDE_OR_EVAL ||
22212222
(EG(current_execute_data)->opline->extended_value != ZEND_INCLUDE_ONCE &&
22222223
EG(current_execute_data)->opline->extended_value != ZEND_REQUIRE_ONCE)) {

0 commit comments

Comments
 (0)