diff options
| author | Nikita Popov <nikic@php.net> | 2016-04-24 23:49:52 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-05-24 20:48:24 +0200 |
| commit | 91f5940329fede8a26b64e99d4d6d858fe8654cc (patch) | |
| tree | b5874f30a7d0d3c4bec3503aeac4d5b097da9e43 /Zend/zend_vm_execute.h | |
| parent | 674297c7e41013c2c34d770051714518d0586271 (diff) | |
| download | php-git-91f5940329fede8a26b64e99d4d6d858fe8654cc.tar.gz | |
Forbid dynamic calls to scope introspection functions
Per RFC:
https://wiki.php.net/rfc/forbid_dynamic_scope_introspection
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 1b673b8c2a..9f6130c059 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5460,7 +5460,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS zend_class_entry *called_scope; zend_object *object; zend_execute_data *call; - uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; + uint32_t call_info = ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_DYNAMIC; SAVE_OPLINE(); function_name = EX_CONSTANT(opline->op2); @@ -9279,7 +9279,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H zend_class_entry *called_scope; zend_object *object; zend_execute_data *call; - uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; + uint32_t call_info = ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_DYNAMIC; SAVE_OPLINE(); function_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -11187,7 +11187,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV zend_class_entry *called_scope; zend_object *object; zend_execute_data *call; - uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; + uint32_t call_info = ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_DYNAMIC; SAVE_OPLINE(); function_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); |