mirror of
https://github.com/php/php-src.git
synced 2025-01-10 13:03:54 +08:00
Merge branch 'PHP-7.0' into PHP-7.1
This commit is contained in:
commit
a5129bcb5b
@ -317,6 +317,17 @@ zend_op_array *phpdbg_init_compile_file(zend_file_handle *file, int type) {
|
||||
dataptr = zend_hash_str_find_ptr(&PHPDBG_G(file_sources), filename, strlen(filename));
|
||||
ZEND_ASSERT(dataptr != NULL);
|
||||
|
||||
if (op_array->vars) {
|
||||
int i;
|
||||
/* un-intern these strings to prevent zend_restore_strings from invalidating our string pointers too early */
|
||||
for (i = 0; i < op_array->last_var; i++) {
|
||||
zend_string **s = op_array->vars + i;
|
||||
if (ZSTR_IS_INTERNED(*s)) {
|
||||
*s = zend_string_init(ZSTR_VAL(*s), ZSTR_LEN(*s), 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dataptr->op_array = *op_array;
|
||||
if (dataptr->op_array.refcount) {
|
||||
++*dataptr->op_array.refcount;
|
||||
|
Loading…
Reference in New Issue
Block a user