1 files changed, 118 insertions, 90 deletions

diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c
index 85b6eeb3b5..bff971d4cf 100644
--- a/sapi/phpdbg/phpdbg_utils.c
+++ b/sapi/phpdbg/phpdbg_utils.c
@@ -165,27 +165,25 @@ PHPDBG_API const char *phpdbg_current_file(TSRMLS_D) /* {{{ */
 PHPDBG_API const zend_function *phpdbg_get_function(const char *fname, const char *cname TSRMLS_DC) /* {{{ */
 {
 	zend_function *func = NULL;
-	size_t fname_len = strlen(fname);
-	char *lcname = zend_str_tolower_dup(fname, fname_len);
+	zend_string *lfname = zend_string_alloc(strlen(fname), 0);
+	memcpy(lfname->val, zend_str_tolower_dup(fname, lfname->len), lfname->len + 1);
 
 	if (cname) {
-		zend_class_entry **ce;
-		size_t cname_len = strlen(cname);
-		char *lc_cname = zend_str_tolower_dup(cname, cname_len);
-		int ret = zend_lookup_class(lc_cname, cname_len, &ce TSRMLS_CC);
+		zend_class_entry *ce;
+		zend_string *lcname = zend_string_alloc(strlen(cname), 0);
+		memcpy(lcname->val, zend_str_tolower_dup(cname, lcname->len), lcname->len + 1);
+		ce = zend_lookup_class(lcname TSRMLS_CC);
 
-		efree(lc_cname);
+		efree(lcname);
 
-		if (ret == SUCCESS) {
-			zend_hash_find(&(*ce)->function_table, lcname, fname_len+1,
-				(void**)&func);
+		if (ce) {
+			func = zend_hash_find_ptr(&ce->function_table, lfname);
 		}
 	} else {
-		zend_hash_find(EG(function_table), lcname, fname_len+1,
-			(void**)&func);
+		func = zend_hash_find_ptr(EG(function_table), lfname);
 	}
 
-	efree(lcname);
+	efree(lfname);
 	return func;
 } /* }}} */
 
@@ -315,18 +313,14 @@ PHPDBG_API const char *phpdbg_get_prompt(TSRMLS_D) /* {{{ */
 } /* }}} */
 
 int phpdbg_rebuild_symtable(TSRMLS_D) {
-	if (!EG(active_op_array)) {
+	if (!EG(current_execute_data) || !EG(current_execute_data)->func) {
 		phpdbg_error("inactive", "type=\"op_array\"", "No active op array!");
 		return FAILURE;
 	}
 
-	if (!EG(active_symbol_table)) {
-		zend_rebuild_symbol_table(TSRMLS_C);
-
-		if (!EG(active_symbol_table)) {
-			phpdbg_error("inactive", "type=\"symbol_table\"", "No active symbol table!");
-			return FAILURE;
-		}
+	if (!zend_rebuild_symbol_table(TSRMLS_C)) {
+		phpdbg_error("inactive", "type=\"symbol_table\"", "No active symbol table!");
+		return FAILURE;
 	}
 
 	return SUCCESS;
@@ -359,10 +353,10 @@ PHPDBG_API void phpdbg_set_async_io(int fd) {
 #endif
 }
 
-int phpdbg_safe_class_lookup(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC) {
+int phpdbg_safe_class_lookup(const char *name, int name_length, zend_class_entry **ce TSRMLS_DC) {
 	if (PHPDBG_G(flags) & PHPDBG_IN_SIGNAL_HANDLER) {
 		char *lc_name, *lc_free;
-		int lc_length, ret = FAILURE;
+		int lc_length;
 
 		if (name == NULL || !name_length) {
 			return FAILURE;
@@ -378,16 +372,19 @@ int phpdbg_safe_class_lookup(const char *name, int name_length, zend_class_entry
 		}
 
 		phpdbg_try_access {
-			ret = zend_hash_find(EG(class_table), lc_name, lc_length, (void **) &ce);
+			*ce = zend_hash_str_find_ptr(EG(class_table), lc_name, lc_length);
 		} phpdbg_catch_access {
 			phpdbg_error("signalsegv", "class=\"%.*s\"", "Could not fetch class %.*s, invalid data source", name_length, name);
 		} phpdbg_end_try_access();
 
 		efree(lc_free);
-		return ret;
 	} else {
-		return zend_lookup_class(name, name_length, ce TSRMLS_CC);
+		zend_string *str_name = zend_string_init(name, name_length, 0);
+		*ce = zend_lookup_class(str_name TSRMLS_CC);
+		efree(str_name);
 	}
+
+	return ce ? SUCCESS : FAILURE;
 }
 
 char *phpdbg_get_property_key(char *key) {
@@ -397,7 +394,7 @@ char *phpdbg_get_property_key(char *key) {
 	return strchr(key + 1, 0) + 1;
 }
 
-static int phpdbg_parse_variable_arg_wrapper(char *name, size_t len, char *keyname, size_t keylen, HashTable *parent, zval **zv, phpdbg_parse_var_func callback TSRMLS_DC) {
+static int phpdbg_parse_variable_arg_wrapper(char *name, size_t len, char *keyname, size_t keylen, HashTable *parent, zval *zv, phpdbg_parse_var_func callback TSRMLS_DC) {
 	return callback(name, len, keyname, keylen, parent, zv TSRMLS_CC);
 }
 
@@ -410,7 +407,7 @@ PHPDBG_API int phpdbg_parse_variable_with_arg(char *input, size_t len, HashTable
 	zend_bool new_index = 1;
 	char *last_index;
 	size_t index_len = 0;
-	zval **zv;
+	zval *zv;
 
 	if (len < 2 || *input != '$') {
 		goto error;
@@ -446,50 +443,64 @@ PHPDBG_API int phpdbg_parse_variable_with_arg(char *input, size_t len, HashTable
 		}
 
 		if (new_index && index_len == 0) {
-			HashPosition position;
-			for (zend_hash_internal_pointer_reset_ex(parent, &position);
-			     zend_hash_get_current_data_ex(parent, (void **)&zv, &position) == SUCCESS;
-			     zend_hash_move_forward_ex(parent, &position)) {
+			zend_ulong numkey;
+			zend_string *strkey;
+			ZEND_HASH_FOREACH_KEY_PTR(parent, numkey, strkey, zv) {
+				while (Z_TYPE_P(zv) == IS_INDIRECT) {
+					zv = Z_INDIRECT_P(zv);
+				}
+
 				if (i == len || (i == len - 1 && input[len - 1] == ']')) {
-					zval *key = emalloc(sizeof(zval));
-					size_t namelen;
+					char *key, *propkey;
+					size_t namelen, keylen;
 					char *name;
 					char *keyname = estrndup(last_index, index_len);
-					zend_hash_get_current_key_zval_ex(parent, key, &position);
-					convert_to_string(key);
-					name = emalloc(i + Z_STRLEN_P(key) + 2);
-					namelen = sprintf(name, "%.*s%s%s", (int)i, input, phpdbg_get_property_key(Z_STRVAL_P(key)), input[len - 1] == ']'?"]":"");
-					efree(key);
+					if (strkey) {
+						key = strkey->val;
+						keylen = strkey->len;
+					} else {
+						keylen = spprintf(&key, 0, "%llu", numkey);
+					}
+					propkey = phpdbg_get_property_key(key);
+					name = emalloc(i + keylen + 2);
+					namelen = sprintf(name, "%.*s%.*s%s", (int) i, input, keylen - (propkey - key), propkey, input[len - 1] == ']'?"]":"");
+					if (!strkey) {
+						efree(key);
+					}
 
 					ret = callback(name, namelen, keyname, index_len, parent, zv, arg TSRMLS_CC) == SUCCESS || ret == SUCCESS?SUCCESS:FAILURE;
-				} else if (Z_TYPE_PP(zv) == IS_OBJECT) {
-					phpdbg_parse_variable_with_arg(input, len, Z_OBJPROP_PP(zv), i, callback, silent, arg TSRMLS_CC);
-				} else if (Z_TYPE_PP(zv) == IS_ARRAY) {
-					phpdbg_parse_variable_with_arg(input, len, Z_ARRVAL_PP(zv), i, callback, silent, arg TSRMLS_CC);
+				} else if (Z_TYPE_P(zv) == IS_OBJECT) {
+					phpdbg_parse_variable_with_arg(input, len, Z_OBJPROP_P(zv), i, callback, silent, arg TSRMLS_CC);
+				} else if (Z_TYPE_P(zv) == IS_ARRAY) {
+					phpdbg_parse_variable_with_arg(input, len, Z_ARRVAL_P(zv), i, callback, silent, arg TSRMLS_CC);
 				} else {
 					/* Ignore silently */
 				}
-			}
+			} ZEND_HASH_FOREACH_END();
 			return ret;
 		} else if (new_index) {
 			char last_chr = last_index[index_len];
 			last_index[index_len] = 0;
-			if (zend_symtable_find(parent, last_index, index_len + 1, (void **)&zv) == FAILURE) {
+			if (!(zv = zend_symtable_str_find(parent, last_index, index_len))) {
 				if (!silent) {
 					phpdbg_error("variable", "type=\"undefined\" variable=\"%.*s\"", "%.*s is undefined", (int) i, input);
 				}
 				return FAILURE;
 			}
+			while (Z_TYPE_P(zv) == IS_INDIRECT) {
+				zv = Z_INDIRECT_P(zv);
+			}
+
 			last_index[index_len] = last_chr;
 			if (i == len) {
 				char *name = estrndup(input, len);
 				char *keyname = estrndup(last_index, index_len);
 
 				ret = callback(name, len, keyname, index_len, parent, zv, arg TSRMLS_CC) == SUCCESS || ret == SUCCESS?SUCCESS:FAILURE;
-			} else if (Z_TYPE_PP(zv) == IS_OBJECT) {
-				parent = Z_OBJPROP_PP(zv);
-			} else if (Z_TYPE_PP(zv) == IS_ARRAY) {
-				parent = Z_ARRVAL_PP(zv);
+			} else if (Z_TYPE_P(zv) == IS_OBJECT) {
+				parent = Z_OBJPROP_P(zv);
+			} else if (Z_TYPE_P(zv) == IS_ARRAY) {
+				parent = Z_ARRVAL_P(zv);
 			} else {
 				phpdbg_error("variable", "type=\"notiterable\" variable=\"%.*s\"", "%.*s is nor an array nor an object", (int) i, input);
 				return FAILURE;
@@ -504,14 +515,22 @@ PHPDBG_API int phpdbg_parse_variable_with_arg(char *input, size_t len, HashTable
 		return FAILURE;
 }
 
-static int phpdbg_xml_array_element_dump(zval **zv TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) {
+int phpdbg_is_auto_global(char *name, int len TSRMLS_DC) {
+	int ret;
+	zend_string *str = zend_string_init(name, len, 0);
+	ret = zend_is_auto_global(str TSRMLS_CC);
+	efree(str);
+	return ret;
+}
+
+static int phpdbg_xml_array_element_dump(zval *zv, zend_string *key, zend_ulong num TSRMLS_DC) {
 	phpdbg_xml("<element");
 
 	phpdbg_try_access {
-		if (hash_key->nKeyLength == 0) { /* numeric key */
-			phpdbg_xml(" name=\"%ld\"", hash_key->h);
-		} else { /* string key */
-			phpdbg_xml(" name=\"%.*s\"", hash_key->nKeyLength - 1, hash_key->arKey);
+		if (key) { /* string key */
+			phpdbg_xml(" name=\"%.*s\"", key->len, key->val);
+		} else { /* numeric key */
+			phpdbg_xml(" name=\"%ld\"", num);
 		}
 	} phpdbg_catch_access {
 		phpdbg_xml(" severity=\"error\" ></element>");
@@ -527,15 +546,13 @@ static int phpdbg_xml_array_element_dump(zval **zv TSRMLS_DC, int num_args, va_l
 	return 0;
 }
 
-static int phpdbg_xml_object_property_dump(zval **zv TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) {
+static int phpdbg_xml_object_property_dump(zval *zv, zend_string *key, zend_ulong num TSRMLS_DC) {
 	phpdbg_xml("<property");
 
 	phpdbg_try_access {
-		if (hash_key->nKeyLength == 0) { /* numeric key */
-			phpdbg_xml(" name=\"%ld\"", hash_key->h);
-		} else { /* string key */
+		if (key) { /* string key */
 			const char *prop_name, *class_name;
-			int unmangle = zend_unmangle_property_name(hash_key->arKey, hash_key->nKeyLength - 1, &class_name, &prop_name);
+			int unmangle = zend_unmangle_property_name(key, &class_name, &prop_name);
 
 			if (class_name && unmangle == SUCCESS) {
 				phpdbg_xml(" name=\"%s\"", prop_name);
@@ -545,8 +562,10 @@ static int phpdbg_xml_object_property_dump(zval **zv TSRMLS_DC, int num_args, va
 					phpdbg_xml(" class=\"%s\" protection=\"private\"", class_name);
 				}
 			} else {
-				phpdbg_xml(" name=\"%.*s\" protection=\"public\"", hash_key->nKeyLength - 1, hash_key->arKey);
+				phpdbg_xml(" name=\"%.*s\" protection=\"public\"", key->len, key->val);
 			}
+		} else { /* numeric key */
+			phpdbg_xml(" name=\"%ld\" protection=\"public\"", num);
 		}
 	} phpdbg_catch_access {
 		phpdbg_xml(" severity=\"error\" ></property>");
@@ -562,37 +581,46 @@ static int phpdbg_xml_object_property_dump(zval **zv TSRMLS_DC, int num_args, va
 	return 0;
 }
 
-#define COMMON (Z_ISREF_PP(zv) ? "&" : "")
+#define COMMON (is_ref ? "&" : "")
 
-PHPDBG_API void phpdbg_xml_var_dump(zval **zv TSRMLS_DC) {
+PHPDBG_API void phpdbg_xml_var_dump(zval *zv TSRMLS_DC) {
 	HashTable *myht;
-	const char *class_name;
-	zend_uint class_name_len;
-	int (*element_dump_func)(zval** TSRMLS_DC, int, va_list, zend_hash_key*);
+	zend_string *class_name, *key;
+	zend_ulong num;
+	zval *val;
+	int (*element_dump_func)(zval *zv, zend_string *key, zend_ulong num TSRMLS_DC);
+	zend_bool is_ref = 0;
+
 	int is_temp;
 
 	phpdbg_try_access {
-		switch (Z_TYPE_PP(zv)) {
-			case IS_BOOL:
-				phpdbg_xml("<bool refstatus=\"%s\" value=\"%s\" />", COMMON, Z_LVAL_PP(zv) ? "true" : "false");
+		is_ref = Z_ISREF_P(zv) && GC_REFCOUNT(Z_COUNTED_P(zv)) > 1;
+		ZVAL_DEREF(zv);
+
+		switch (Z_TYPE_P(zv)) {
+			case IS_TRUE:
+				phpdbg_xml("<bool refstatus=\"%s\" value=\"true\" />", COMMON);
+				break;
+			case IS_FALSE:
+				phpdbg_xml("<bool refstatus=\"%s\" value=\"false\" />", COMMON);
 				break;
 			case IS_NULL:
 				phpdbg_xml("<null refstatus=\"%s\" />", COMMON);
 				break;
 			case IS_LONG:
-				phpdbg_xml("<int refstatus=\"%s\" value=\"%ld\" />", COMMON, Z_LVAL_PP(zv));
+				phpdbg_xml("<int refstatus=\"%s\" value=\"" ZEND_LONG_FMT "\" />", COMMON, Z_LVAL_P(zv));
 				break;
 			case IS_DOUBLE:
-				phpdbg_xml("<float refstatus=\"%s\" value=\"%.*G\" />", COMMON, (int) EG(precision), Z_DVAL_PP(zv));
+				phpdbg_xml("<float refstatus=\"%s\" value=\"%.*G\" />", COMMON, (int) EG(precision), Z_DVAL_P(zv));
 				break;
 			case IS_STRING:
-				phpdbg_xml("<string refstatus=\"%s\" length=\"%d\" value=\"%.*s\" />", COMMON, Z_STRLEN_PP(zv), Z_STRLEN_PP(zv), Z_STRVAL_PP(zv));
-					break;
+				phpdbg_xml("<string refstatus=\"%s\" length=\"%d\" value=\"%.*s\" />", COMMON, Z_STRLEN_P(zv), Z_STRLEN_P(zv), Z_STRVAL_P(zv));
+				break;
 			case IS_ARRAY:
-				myht = Z_ARRVAL_PP(zv);
-				if (++myht->nApplyCount > 1) {
+				myht = Z_ARRVAL_P(zv);
+				if (ZEND_HASH_APPLY_PROTECTION(myht) && ++myht->u.v.nApplyCount > 1) {
 					phpdbg_xml("<recursion />");
-					--myht->nApplyCount;
+					--myht->u.v.nApplyCount;
 					break;
 				}
 				phpdbg_xml("<array refstatus=\"%s\" num=\"%d\">", COMMON, zend_hash_num_elements(myht));
@@ -600,39 +628,39 @@ PHPDBG_API void phpdbg_xml_var_dump(zval **zv TSRMLS_DC) {
 				is_temp = 0;
 				goto head_done;
 			case IS_OBJECT:
-				myht = Z_OBJDEBUG_PP(zv, is_temp);
-				if (myht && ++myht->nApplyCount > 1) {
+				myht = Z_OBJDEBUG_P(zv, is_temp);
+				if (myht && ++myht->u.v.nApplyCount > 1) {
 					phpdbg_xml("<recursion />");
-					--myht->nApplyCount;
+					--myht->u.v.nApplyCount;
 					break;
 				}
-	
-				if (Z_OBJ_HANDLER(**zv, get_class_name)) {
-					Z_OBJ_HANDLER(**zv, get_class_name)(*zv, &class_name, &class_name_len, 0 TSRMLS_CC);
-					phpdbg_xml("<object refstatus=\"%s\" class=\"%s\" id=\"%d\" num=\"%d\">", COMMON, class_name, Z_OBJ_HANDLE_PP(zv), myht ? zend_hash_num_elements(myht) : 0);
-					efree((char*)class_name);
-				} else {
-					phpdbg_xml("<object refstatus=\"%s\" class=\"\" id=\"%d\" num=\"%d\">", COMMON, Z_OBJ_HANDLE_PP(zv), myht ? zend_hash_num_elements(myht) : 0);
-				}
+
+				class_name = Z_OBJ_HANDLER_P(zv, get_class_name)(Z_OBJ_P(zv) TSRMLS_CC);
+				phpdbg_xml("<object refstatus=\"%s\" class=\"%.*s\" id=\"%d\" num=\"%d\">", COMMON, class_name->len, class_name->val, Z_OBJ_HANDLE_P(zv), myht ? zend_hash_num_elements(myht) : 0);
+				zend_string_release(class_name);
+
 				element_dump_func = phpdbg_xml_object_property_dump;
 head_done:
 				if (myht) {
+					ZEND_HASH_FOREACH_KEY_VAL_IND(myht, num, key, val) {
+						element_dump_func(val, key, num TSRMLS_CC);
+					} ZEND_HASH_FOREACH_END();
 					zend_hash_apply_with_arguments(myht TSRMLS_CC, (apply_func_args_t) element_dump_func, 0);
-					--myht->nApplyCount;
+					--myht->u.v.nApplyCount;
 					if (is_temp) {
 						zend_hash_destroy(myht);
 						efree(myht);
 					}
 				}
-				if (Z_TYPE_PP(zv) == IS_ARRAY) {
+				if (Z_TYPE_P(zv) == IS_ARRAY) {
 					phpdbg_xml("</array>");
 				} else {
 					phpdbg_xml("</object>");
 				}
 				break;
 			case IS_RESOURCE: {
-				const char *type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(zv) TSRMLS_CC);
-				phpdbg_xml("<resource refstatus=\"%s\" id=\"%ld\" type=\"%ld\" />", COMMON, Z_LVAL_PP(zv), type_name ? type_name : "unknown");
+				const char *type_name = zend_rsrc_list_get_rsrc_type(Z_RES_P(zv) TSRMLS_CC);
+				phpdbg_xml("<resource refstatus=\"%s\" id=\"%pd\" type=\"%ld\" />", COMMON, Z_RES_P(zv)->handle, type_name ? type_name : "unknown");
 				break;
 			}
 			default: