Skip to content

Commit 5a86802

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

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
@@ -2202,9 +2202,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
22022202

22032203
/* see bug #15471 (old BTS) */
22042204
if (persistent_script->script.filename) {
2205-
if (!EG(current_execute_data) || !EG(current_execute_data)->opline ||
2205+
if (!EG(current_execute_data) ||
22062206
!EG(current_execute_data)->func ||
22072207
!ZEND_USER_CODE(EG(current_execute_data)->func->common.type) ||
2208+
!EG(current_execute_data)->opline ||
22082209
EG(current_execute_data)->opline->opcode != ZEND_INCLUDE_OR_EVAL ||
22092210
(EG(current_execute_data)->opline->extended_value != ZEND_INCLUDE_ONCE &&
22102211
EG(current_execute_data)->opline->extended_value != ZEND_REQUIRE_ONCE)) {

0 commit comments

Comments
 (0)