php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 05:32:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
This commit is contained in:
Dmitry Stogov
2022-09-19 17:19:38 +03:00
parent 6d6e455000 5a868022e7
commit 8f3c1940f9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/opcache/ZendAccelerator.c
View File

@@ -2202,9 +2202,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
/* see bug #15471 (old BTS) */
if (persistent_script->script.filename) {
if (!EG(current_execute_data) || !EG(current_execute_data)->opline ||
if (!EG(current_execute_data) ||
!EG(current_execute_data)->func ||
!ZEND_USER_CODE(EG(current_execute_data)->func->common.type) ||
!EG(current_execute_data)->opline ||
EG(current_execute_data)->opline->opcode != ZEND_INCLUDE_OR_EVAL ||
(EG(current_execute_data)->opline->extended_value != ZEND_INCLUDE_ONCE &&
EG(current_execute_data)->opline->extended_value != ZEND_REQUIRE_ONCE)) {