mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-10 21:14:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source
This commit is contained in:
Bob Weinand 2016-10-01 10:47:31 +01:00
commit a5129bcb5b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sapi/phpdbg/phpdbg_list.c
View File

@ -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)); dataptr = zend_hash_str_find_ptr(&PHPDBG_G(file_sources), filename, strlen(filename));
ZEND_ASSERT(dataptr != NULL); 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; dataptr->op_array = *op_array;
if (dataptr->op_array.refcount) { if (dataptr->op_array.refcount) {
++*dataptr->op_array.refcount; ++*dataptr->op_array.refcount;