php-src/Zend
Niels Dossche a3a3964497 Fix oss-fuzz #61712: assertion failure with error handler during binary op
Because the error handler is invoked after the property is updated,
the error handler has the opportunity to remove it before the property
is returned.

Switching the order around fixes this issue. The comments mention that
the current ordering prevents overwriting the EG(std_property_info)
field in the error handler. EG(std_property_info) no longer exists as it
was removed in 7471c217. Back then a global was used to store the
returned property info, but as this is no longer the case there is no
longer a need to protect against overwriting a global.

Closes GH-12062.
2023-08-28 20:00:49 +02:00
..
asm Merge branch 'PHP-8.2' 2023-02-05 16:47:09 +00:00
Optimizer Merge branch 'PHP-8.2' 2023-07-31 14:51:14 +03:00
tests Fix oss-fuzz #61712: assertion failure with error handler during binary op 2023-08-28 20:00:49 +02:00
bench.php
LICENSE
Makefile.frag Remove unneeded zend_language_parser.h patch (#11974) 2023-08-22 11:21:42 +02:00
micro_bench.php
README.md [ci skip] Update README.md on ZE description 2022-02-08 10:38:33 +01:00
zend_alloc_sizes.h Fix GH-9361: Segmentation fault on script exit 2022-08-22 12:59:17 +02:00
zend_alloc.c Add block size support for tracked_malloc (#11856) 2023-08-03 10:08:41 +02:00
zend_alloc.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_API.c Introduce Zend guard recursion protection 2023-08-24 13:03:14 +01:00
zend_API.h Add number or str ZPP macros 2023-06-18 13:09:03 +01:00
zend_arena.h Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_ast.c More usage of known zend_str instead of C string (#11381) 2023-06-08 13:03:29 +01:00
zend_ast.h Use zend_ast_size consistenly (#11955) 2023-08-14 00:51:14 +02:00
zend_atomic.c Fixed undefined macros warnings 2022-09-22 13:17:02 +02:00
zend_atomic.h Fixed undefined macros warnings 2022-09-22 13:17:02 +02:00
zend_attributes_arginfo.h Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs 2023-08-26 21:35:31 +02:00
zend_attributes.c RFC: Add #[Override] attribute (#9836) 2023-06-29 20:23:53 +02:00
zend_attributes.h RFC: Add #[Override] attribute (#9836) 2023-06-29 20:23:53 +02:00
zend_attributes.stub.php Add support for typed class constants in stubs 2023-07-01 11:50:04 +02:00
zend_bitset.h Add AVX2-accelerated UTF-16 decoding/encoding routines 2023-02-05 20:06:42 +02:00
zend_build.h Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_builtin_functions_arginfo.h Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs 2023-08-26 21:35:31 +02:00
zend_builtin_functions.c Deprecate calling get_class() and get_parent_class() without arguments 2023-07-18 12:59:21 +02:00
zend_builtin_functions.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_builtin_functions.stub.php Fix gc_status type info 2023-07-17 13:49:23 +02:00
zend_call_stack.c zend call stack fix freebsd code path. (#11766) 2023-07-23 18:55:14 +01:00
zend_call_stack.h zend_call_stack_default_size update BSD values. (#12051) 2023-08-26 16:36:02 +01:00
zend_closures_arginfo.h Add ZEND_ACC_NOT_SERIALIZABLE flag 2021-07-19 15:59:11 +02:00
zend_closures.c Fix GH-11406: segfault with unpacking and magic method closure 2023-06-13 17:39:47 +02:00
zend_closures.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_closures.stub.php Add ZEND_ACC_NOT_SERIALIZABLE flag 2021-07-19 15:59:11 +02:00
zend_compile.c Use a single version of strnlen (#12015) 2023-08-22 17:40:24 +02:00
zend_compile.h RFC: Add #[Override] attribute (#9836) 2023-06-29 20:23:53 +02:00
zend_config.w32.h
zend_constants_arginfo.h Declare remaining Zend constants in stubs (#9730) 2022-10-12 22:43:36 +02:00
zend_constants.c Revert "Remove name field from the zend_constant struct (#10954)" 2023-07-17 22:32:41 +02:00
zend_constants.h Revert "Remove name field from the zend_constant struct (#10954)" 2023-07-17 22:32:41 +02:00
zend_constants.stub.php Declare remaining Zend constants in stubs (#9730) 2022-10-12 22:43:36 +02:00
zend_cpuinfo.c Windows arm64 zend and standard extension support 2022-08-09 12:45:14 +02:00
zend_cpuinfo.h Cacheline demote to improve performance (#11101) 2023-05-15 10:28:43 +03:00
zend_default_classes.c
zend_dtrace.c
zend_dtrace.d
zend_dtrace.h
zend_enum_arginfo.h
zend_enum.c More usage of known zend_str instead of C string (#11381) 2023-06-08 13:03:29 +01:00
zend_enum.h zend_compiler, ...: use uint8_t instead of zend_uchar (#10621) 2023-02-23 14:56:54 +00:00
zend_enum.stub.php
zend_errors.h
zend_exceptions_arginfo.h Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs 2023-08-26 21:35:31 +02:00
zend_exceptions.c Fix incorrect handling of unwind and graceful exit exceptions 2023-07-07 08:15:17 +02:00
zend_exceptions.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_exceptions.stub.php Require zend_constants.stub.php from zend_exceptions.stubs.php 2022-07-12 10:35:03 +02:00
zend_execute_API.c Merge branch 'PHP-8.2' 2023-08-03 09:50:32 +02:00
zend_execute.c zend vm savee registers support for riscv 64. (#11773) 2023-07-24 08:25:45 +01:00
zend_execute.h Assert ptr_ptr value of TMP|CONST isn't used (#11865) 2023-08-03 15:28:19 +02:00
zend_extensions.c Document zend_get_op_array_extension_handle 2023-03-30 17:45:34 -06:00
zend_extensions.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_fibers_arginfo.h Add ZEND_ACC_NOT_SERIALIZABLE flag 2021-07-19 15:59:11 +02:00
zend_fibers.c Merge branch 'PHP-8.2' 2023-05-11 14:35:42 +02:00
zend_fibers.h Zend/zend_fibers: change return value to zend_result 2023-02-26 15:07:08 +00:00
zend_fibers.stub.php Add ZEND_ACC_NOT_SERIALIZABLE flag 2021-07-19 15:59:11 +02:00
zend_float.c Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_float.h Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_gc.c Remove WeakMap entries whose key is only reachable through the entry value (#10932) 2023-07-16 13:39:08 +02:00
zend_gc.h Remove WeakMap entries whose key is only reachable through the entry value (#10932) 2023-07-16 13:39:08 +02:00
zend_gdb.c Merge branch 'PHP-8.2' 2023-07-13 12:40:59 +01:00
zend_gdb.h
zend_generators_arginfo.h Add ZEND_ACC_NOT_SERIALIZABLE flag 2021-07-19 15:59:11 +02:00
zend_generators.c Merge branch 'PHP-8.2' 2023-04-15 18:34:13 +02:00
zend_generators.h zend_compiler, ...: use uint8_t instead of zend_uchar (#10621) 2023-02-23 14:56:54 +00:00
zend_generators.stub.php Add ZEND_ACC_NOT_SERIALIZABLE flag 2021-07-19 15:59:11 +02:00
zend_globals_macros.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_globals.h Shrink some commonly used structs by reordering members (#10880) 2023-03-22 19:26:42 +01:00
zend_hash.c Track HashTableIterators for copy-on-write copies of HashTables 2023-08-28 01:25:12 +02:00
zend_hash.h Fix number of elements after packed hash filling (#11022) 2023-04-06 21:54:59 +02:00
zend_highlight.c Align highlight_string|file with HTML standard and modern browsers 2023-08-12 15:08:28 +01:00
zend_highlight.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_hrtime.c Expose time spent collecting cycles in gc_status() (#11523) 2023-07-16 12:34:28 +02:00
zend_hrtime.h Remove check for time.h and HAVE_TIME_H (#11726) 2023-07-20 09:38:53 +02:00
zend_inheritance.c Merge branch 'PHP-8.2' 2023-08-15 17:01:51 +01:00
zend_inheritance.h RFC: Add #[Override] attribute (#9836) 2023-06-29 20:23:53 +02:00
zend_ini_parser.y Use :- as ini interpolation fallback separator 2023-07-18 08:31:02 +01:00
zend_ini_scanner.h Zend/zend_ini_scanner: parse const strings 2023-01-04 12:49:48 +00:00
zend_ini_scanner.l small fixes 2023-07-18 08:31:02 +01:00
zend_ini.c Merge branch 'PHP-8.2' 2023-02-21 13:54:12 +00:00
zend_ini.h Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_interfaces_arginfo.h Drop serial denier functions 2021-07-20 13:11:11 +02:00
zend_interfaces.c More usage of known zend_str instead of C string (#11381) 2023-06-08 13:03:29 +01:00
zend_interfaces.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_interfaces.stub.php Drop serial denier functions 2021-07-20 13:11:11 +02:00
zend_istdiostream.h
zend_iterators.c Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_iterators.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_language_parser.y Correctly handle multiple constants in typed declaration 2023-05-21 14:17:01 +01:00
zend_language_scanner.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_language_scanner.l Fix GH-10634: Lexing memory corruption (#10866) 2023-03-17 17:09:14 +01:00
zend_list.c Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_list.h Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_llist.c Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_llist.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_long.h Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_map_ptr.h Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_max_execution_timer.c fix: support for timeouts with ZTS on Linux (#10141) 2023-03-03 11:35:06 +01:00
zend_max_execution_timer.h fix: support for timeouts with ZTS on Linux (#10141) 2023-03-03 11:35:06 +01:00
zend_mmap.h Use PDEATHSIG to kill cli-server workers if parent exists 2022-09-08 10:48:20 +02:00
zend_modules.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_multibyte.c Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_multibyte.h Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_multiply.h Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_object_handlers.c Fix oss-fuzz #61712: assertion failure with error handler during binary op 2023-08-28 20:00:49 +02:00
zend_object_handlers.h Introduce Zend guard recursion protection 2023-08-24 13:03:14 +01:00
zend_objects_API.c Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_objects_API.h Zend/zend_types.h: deprecate zend_bool, zend_intptr_t, zend_uintptr_t (#10597) 2023-02-18 19:31:28 +00:00
zend_objects.c Introduce Zend guard recursion protection 2023-08-24 13:03:14 +01:00
zend_objects.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_observer.c Fix add/remove observer API with multiple observers installed 2023-06-09 14:00:53 +02:00
zend_observer.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_opcode.c releases property attributes of internal classes (#11980) 2023-08-24 16:07:00 +02:00
zend_operators.c Fix OSS-fuzz #60709 unseting op via globals 2023-08-01 16:40:25 +01:00
zend_operators.h Use a single version of strnlen (#12015) 2023-08-22 17:40:24 +02:00
zend_portability.h [Zend]: Fix unnecessary alignment in ZEND_CALL_FRAME_SLOT macro (#10988) 2023-04-04 12:09:38 +02:00
zend_ptr_stack.c Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_ptr_stack.h Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_range_check.h
zend_signal.c Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_signal.h Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_smart_str_public.h Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_smart_str.c Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_smart_str.h Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_smart_string_public.h Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_smart_string.h Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_sort.c Revert "#include cleanup (#10216)" 2023-01-16 12:29:41 +01:00
zend_sort.h Revert "#include cleanup (#10216)" 2023-01-16 12:29:41 +01:00
zend_stack.c Two enums instead of preprocessor macros (#10617) 2023-02-21 15:34:33 +01:00
zend_stack.h Two enums instead of preprocessor macros (#10617) 2023-02-21 15:34:33 +01:00
zend_stream.c Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_stream.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_string.c Merge branch 'PHP-8.2' 2023-05-03 19:49:02 +02:00
zend_string.h Revert "Use binary safe case compare in new zend_string API" 2023-07-05 18:13:04 +01:00
zend_strtod_int.h build/php.m4: remove test for integer types (#10304) 2023-01-13 11:51:15 +00:00
zend_strtod.c Mark constant static arrays in function bodies actually as const (#10325) 2023-01-15 14:51:31 +00:00
zend_strtod.h Move php_gcvt to zend_gcvt 2021-08-02 14:51:46 +02:00
zend_system_id.c zend_compiler, ...: use uint8_t instead of zend_uchar (#10621) 2023-02-23 14:56:54 +00:00
zend_system_id.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_type_info.h Convert iterable into an internal alias for Traversable|array (#7309) 2022-06-07 13:35:34 +01:00
zend_types.h Address CR comments 2023-08-28 01:25:12 +02:00
zend_variables.c Revert "Zend/zend_type_code: remove hard-coded integer values and" 2023-03-03 21:19:58 +00:00
zend_variables.h Revert GH-10220 2023-01-16 12:27:33 +01:00
zend_virtual_cwd.c Remove unnecessary memory clearing in virtual_file_ex() (#10963) 2023-04-12 21:28:53 +02:00
zend_virtual_cwd.h Cache d_type in directory entry 2023-07-07 18:02:32 +02:00
zend_vm_def.h Add typed specialization for ZEND_COUNT (#11825) 2023-08-03 12:33:32 +02:00
zend_vm_execute.h Assert ptr_ptr value of TMP|CONST isn't used (#11865) 2023-08-03 15:28:19 +02:00
zend_vm_execute.skl Zend/zend_types.h: deprecate zend_bool, zend_intptr_t, zend_uintptr_t (#10597) 2023-02-18 19:31:28 +00:00
zend_vm_gen.php Assert ptr_ptr value of TMP|CONST isn't used (#11865) 2023-08-03 15:28:19 +02:00
zend_vm_handlers.h Add typed specialization for ZEND_COUNT (#11825) 2023-08-03 12:33:32 +02:00
zend_vm_opcodes.c Allow arbitrary expressions in static variable initializer 2023-05-24 20:17:31 +02:00
zend_vm_opcodes.h Allow arbitrary expressions in static variable initializer 2023-05-24 20:17:31 +02:00
zend_vm_trace_handlers.h Use more compact representation for packed arrays. 2021-11-03 15:18:26 +03:00
zend_vm_trace_lines.h
zend_vm_trace_map.h Use more compact representation for packed arrays. 2021-11-03 15:18:26 +03:00
zend_vm.h Add function exposing HAVE_GCC_GLOBAL_REGS (#8359) 2022-06-08 12:32:30 +01:00
zend_weakrefs_arginfo.h Not serializable flag permeation 2021-07-20 12:28:35 +02:00
zend_weakrefs.c Remove WeakMap entries whose key is only reachable through the entry value (#10932) 2023-07-16 13:39:08 +02:00
zend_weakrefs.h Remove WeakMap entries whose key is only reachable through the entry value (#10932) 2023-07-16 13:39:08 +02:00
zend_weakrefs.stub.php Not serializable flag permeation 2021-07-20 12:28:35 +02:00
zend.c Introduce Zend guard recursion protection 2023-08-24 13:03:14 +01:00
zend.h PHP-8.2 is now for PHP 8.2.11-dev 2023-08-15 16:08:52 -04:00
Zend.m4 Remove unused HAVE_GCC_GLOBAL_REGS shell variable (#11877) 2023-08-08 00:51:56 +02:00

Zend Engine

Zend memory manager

General

The goal of the new memory manager (available since PHP 5.2) is to reduce memory allocation overhead and speedup memory management.

Debugging

Normal:

sapi/cli/php -r 'leak();'

Zend MM disabled:

USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'

Shared extensions

Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so that valgrind can correctly track the memory leaks in shared extensions. For this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then DL_UNLOAD() is skipped during the shutdown of shared extensions.

ZEND_VM

ZEND_VM architecture allows specializing opcode handlers according to op_type fields and using different execution methods (call threading, switch threading and direct threading). As a result ZE2 got more than 20% speedup on raw PHP code execution (with specialized executor and direct threading execution method). As in most PHP applications raw execution speed isn't the limiting factor but system calls and database calls are, your mileage with this patch will vary.

Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can find opcode handlers and helpers. The typical opcode handler template looks like this:

ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
{
    <HANDLER'S CODE>
}

<OPCODE-NUMBER> is a opcode number (0, 1, ...) <OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :) <OP1_TYPES> and <OP2_TYPES> are masks for allowed operand op_types. Specializer will generate code only for defined combination of types. You can use any combination of the following op_types UNUSED, CONST, VAR, TMP and CV also you can use ANY mask to disable specialization according operand's op_type. <HANDLER'S CODE> is a handler's code itself. For most handlers it stills the same as in old zend_execute.c, but now it uses macros to access opcode operands and some internal executor data.

You can see the conformity of new macros to old code in the following list:

EXECUTE_DATA
    execute_data
ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
    return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_DISPATCH_TO_HELPER(<NAME>)
    return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>)
    return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_CONTINUE()
    return 0
ZEND_VM_NEXT_OPCODE()
    NEXT_OPCODE()
ZEND_VM_SET_OPCODE(<TARGET>
    SET_OPCODE(<TARGET>
ZEND_VM_INC_OPCODE()
    INC_OPCOD()
ZEND_VM_RETURN_FROM_EXECUTE_LOOP()
    RETURN_FROM_EXECUTE_LOOP()
ZEND_VM_C_LABEL(<LABEL>):
    <LABEL>:
ZEND_VM_C_GOTO(<LABEL>)
    goto <LABEL>
OP<X>_TYPE
    opline->op<X>.op_type
GET_OP<X>_ZVAL_PTR(<TYPE>)
    get_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_ZVAL_PTR_PTR(<TYPE>)
    get_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_OBJ_ZVAL_PTR(<TYPE>)
    get_obj_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_OBJ_ZVAL_PTR_PTR(<TYPE>)
    get_obj_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
IS_OP<X>_TMP_FREE()
    IS_TMP_FREE(free_op<X>)
FREE_OP<X>()
    FREE_OP(free_op<X>)
FREE_OP<X>_IF_VAR()
    FREE_VAR(free_op<X>)
FREE_OP<X>_VAR_PTR()
    FREE_VAR_PTR(free_op<X>)

Executor's helpers can be defined without parameters or with one parameter. This is done with the following constructs:

ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
{
    <HELPER'S CODE>
}

ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
{
    <HELPER'S CODE>
}

The executors code is generated by the PHP script zend_vm_gen.php. It uses zend_vm_def.h and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and zend_vm_execute.h. The first file is a list of opcode definitions. It is included from zend_compile.h. The second one is an executor code itself. It is included from zend_execute.c.

zend_vm_gen.php can produce different kind of executors. You can select a different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO|HYBRID. You can disable opcode specialization using --without-specializer. At last you can debug the executor using the original zend_vm_def.h or the generated zend_vm_execute.h file. Debugging with the original file requires the --with-lines option. By default, Zend Engine uses the following command to generate the executor:

# Default VM kind is HYBRID
php zend_vm_gen.php --with-vm-kind=HYBRID