php-src/Zend
Niels Dossche 727e26f9f2 Fix #97836 and #81705: Segfault / type confusion in concat_function
The following sequence of actions was happening which caused a null
pointer dereference:
1. debug_backtrace() returns an array
2. The concatenation to $c will transform the array to a string via
   `zval_get_string_func` for op2 and output a warning.
   Note that zval op1 is of type string due to the first do-while
   sequence.
3. The warning of an implicit "array to string conversion" triggers
   the ob_start callback to run. This code transform $c (==op1) to a long.
4. The code below the 2 do-while sequences assume that both op1 and op2
   are strings, but this is no longer the case. A dereference of the
   string will therefore result in a null pointer dereference.

The solution used here is to work with the zend_string directly instead
of with the ops.

For the tests:
Co-authored-by: changochen1@gmail.com
Co-authored-by: cmbecker69@gmx.de
Co-authored-by: yukik@risec.co.jp

Closes GH-10049.
2023-05-16 20:27:00 +02:00
..
asm Merge branch 'PHP-8.2' 2023-02-05 16:47:09 +00:00
Optimizer Use shared, immutable array for return value of mb_list_encodings 2023-05-16 07:01:07 -07:00
tests Fix #97836 and #81705: Segfault / type confusion in concat_function 2023-05-16 20:27:00 +02:00
bench.php
LICENSE
Makefile.frag ext/Zend: zend_language_scanner_defs.h as make target 2023-02-17 16:37:13 +00:00
micro_bench.php
README.md [ci skip] Update README.md on ZE description 2022-02-08 10:38:33 +01:00
zend.c Merge branch 'PHP-8.2' 2023-04-20 19:46:34 +02:00
zend.h PHP-8.2 is now for PHP 8.2.7-dev 2023-04-25 18:33:13 +03:00
Zend.m4 Re-enable -Wstrict-aliasing 2023-03-10 17:15:46 +01:00
zend_alloc.c Add zend_alloc XLEAK support 2023-04-03 12:55:26 +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_alloc_sizes.h Fix GH-9361: Segmentation fault on script exit 2022-08-22 12:59:17 +02:00
zend_API.c Typed class constants (#10444) 2023-04-16 22:20:26 +02:00
zend_API.h Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_arena.h Revert GH-10279 2023-01-16 12:25:59 +01:00
zend_ast.c Correctly copy lineno for zval asts (#11203) 2023-05-07 13:17:19 +02:00
zend_ast.h Typed class constants (#10444) 2023-04-16 22:20:26 +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.c Fix GH-8329 Print true/false instead of bool in error and debug messages (#8385) 2023-01-23 10:52:14 +01:00
zend_attributes.h Support the actual #[\SensitiveParameter] attribute in stubs (#8836) 2022-07-12 12:43:44 +02:00
zend_attributes.stub.php Rename @cname to @cvalue in stubs (#9043) 2022-07-19 15:11:42 +02:00
zend_attributes_arginfo.h Fix RC debug of stub attribute (#9082) 2022-07-21 15:06: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.c Remove name field from the zend_constant struct (#10954) 2023-04-03 22:13:47 +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 Add four extra fields to gc_status() (#9336) 2022-10-04 13:56:02 +01:00
zend_builtin_functions_arginfo.h Add four extra fields to gc_status() (#9336) 2022-10-04 13:56:02 +01:00
zend_call_stack.c Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_call_stack.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_closures.c Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_closures.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_closures.stub.php
zend_closures_arginfo.h
zend_compile.c Implement delayed early binding for classes without parents 2023-05-15 10:25:33 +02:00
zend_compile.h Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_config.w32.h
zend_constants.c Typed class constants (#10444) 2023-04-16 22:20:26 +02:00
zend_constants.h Remove name field from the zend_constant struct (#10954) 2023-04-03 22:13:47 +02:00
zend_constants.stub.php Declare remaining Zend constants in stubs (#9730) 2022-10-12 22:43:36 +02:00
zend_constants_arginfo.h 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.c Use new ZSTR_INIT_LITERAL macro (#10879) 2023-03-20 16:19:05 +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_enum_arginfo.h
zend_errors.h
zend_exceptions.c Use new ZSTR_INIT_LITERAL macro (#10879) 2023-03-20 16:19:05 +01: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_exceptions_arginfo.h Require zend_constants.stub.php from zend_exceptions.stubs.php 2022-07-12 10:35:03 +02:00
zend_execute.c Typed class constants (#10444) 2023-04-16 22:20:26 +02:00
zend_execute.h Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_execute_API.c Remove name field from the zend_constant struct (#10954) 2023-04-03 22:13:47 +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.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
zend_fibers_arginfo.h
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 Fix GC_BENCH flag (#10823) 2023-03-10 15:02:22 +01:00
zend_gc.h Delay freeing of overwritten values in assignments 2023-04-04 18:55:46 +02:00
zend_gdb.c Merge branch 'PHP-8.0' into PHP-8.1 2021-12-21 07:19:58 +01:00
zend_gdb.h
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
zend_generators_arginfo.h
zend_globals.h Shrink some commonly used structs by reordering members (#10880) 2023-03-22 19:26:42 +01:00
zend_globals_macros.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_hash.c Merge branch 'PHP-8.2' 2023-05-10 16:46:33 +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
zend_highlight.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03:00
zend_inheritance.c Implement delayed early binding for classes without parents 2023-05-15 10:25:33 +02:00
zend_inheritance.h Convert some macros to zend_always_inline functions (#8288) 2022-08-04 13:24:12 +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_ini_parser.y Fix uninitialized memory in parse_ini_string() 2023-04-17 15:23:06 +02:00
zend_ini_scanner.h Zend/zend_ini_scanner: parse const strings 2023-01-04 12:49:48 +00:00
zend_ini_scanner.l Fix uninitialized memory in parse_ini_string() 2023-04-17 15:23:06 +02:00
zend_interfaces.c Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_interfaces.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_interfaces.stub.php
zend_interfaces_arginfo.h
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 Typed class constants (#10444) 2023-04-16 22:20:26 +02: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 Merge branch 'PHP-8.2' 2023-04-10 23:25:42 +03:00
zend_object_handlers.h zend_compiler, ...: use uint8_t instead of zend_uchar (#10621) 2023-02-23 14:56:54 +00:00
zend_objects.c Allow readonly properties to be reinitialized once during cloning (#10389) 2023-02-28 22:54:38 +01:00
zend_objects.h Revert GH-10300 2023-01-16 12:22:54 +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_observer.c Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_observer.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_opcode.c zend_compiler, ...: use uint8_t instead of zend_uchar (#10621) 2023-02-23 14:56:54 +00:00
zend_operators.c Fix #97836 and #81705: Segfault / type confusion in concat_function 2023-05-16 20:27:00 +02:00
zend_operators.h Revert "Zend/zend_types.h: move zend_result to separate header (#10609)" 2023-04-04 22:48:26 +03: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.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_str_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_smart_string_public.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 Add case insensitive versions of the zend_string_starts_with_* APIs (#11032) 2023-04-10 12:35:52 +01: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
zend_strtod_int.h build/php.m4: remove test for integer types (#10304) 2023-01-13 11:51:15 +00: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 Allow array functions to operate in-place if the refcount is 1 (#11060) 2023-04-24 23:18:05 +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 Fix -Wenum-int-mismatch warnings on gcc 13 2023-04-20 16:04:59 +02:00
zend_vm.h Add function exposing HAVE_GCC_GLOBAL_REGS (#8359) 2022-06-08 12:32:30 +01:00
zend_vm_def.h Typed class constants (#10444) 2023-04-16 22:20:26 +02:00
zend_vm_execute.h Typed class constants (#10444) 2023-04-16 22:20:26 +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 zend_compiler, ...: use uint8_t instead of zend_uchar (#10621) 2023-02-23 14:56:54 +00:00
zend_vm_handlers.h Implement dynamic class const fetch 2023-01-26 16:46:34 +01:00
zend_vm_opcodes.c zend_compiler, ...: use uint8_t instead of zend_uchar (#10621) 2023-02-23 14:56:54 +00:00
zend_vm_opcodes.h zend_compiler, ...: use uint8_t instead of zend_uchar (#10621) 2023-02-23 14:56:54 +00: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_weakrefs.c Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_weakrefs.h Revert GH-10300 2023-01-16 12:22:54 +01:00
zend_weakrefs.stub.php
zend_weakrefs_arginfo.h

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