From: Bob Weinand <bobwei9@hotmail.com>
Date: Wed, 5 Oct 2016 10:08:20 +0000 (+0200)
Subject: Remove phpdbg fix targeting 7.1 which landed in 7.0
X-Git-Tag: php-7.1.0RC4~93^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eaff72f31b6322ff4b035b97af5ea1552b2281b7;p=php

Remove phpdbg fix targeting 7.1 which landed in 7.0
---

diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c
index 74d35c7ce9..6895bea43e 100644
--- a/sapi/phpdbg/phpdbg_list.c
+++ b/sapi/phpdbg/phpdbg_list.c
@@ -316,17 +316,6 @@ 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;