1 files changed, 62 insertions, 80 deletions

diff --git a/sapi/phpdbg/phpdbg_webdata_transfer.c b/sapi/phpdbg/phpdbg_webdata_transfer.c
index 7c169ee113..5ce6759062 100644
--- a/sapi/phpdbg/phpdbg_webdata_transfer.c
+++ b/sapi/phpdbg/phpdbg_webdata_transfer.c
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
@@ -19,93 +19,85 @@
 #include "phpdbg_webdata_transfer.h"
 #include "ext/standard/php_var.h"
 
+static 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;
+}
+
 PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) {
 	zval array;
 	HashTable *ht;
-	/* I really need to change that to an array of zvals... */
-	zval zv1 = {{0}}, *zvp1 = &zv1;
-	zval zv2 = {{0}}, *zvp2 = &zv2;
-	zval zv3 = {{0}}, *zvp3 = &zv3;
-	zval zv4 = {{0}}, *zvp4 = &zv4;
-	zval zv5 = {{0}}, *zvp5 = &zv5;
-	zval zv6 = {{0}}, *zvp6 = &zv6;
-	zval zv7 = {{0}}, *zvp7 = &zv7;
-	zval zv8 = {{0}}, *zvp8 = &zv8;
+	zval zv[9] = {{{0}}};
 
 	array_init(&array);
 	ht = Z_ARRVAL(array);
 
 	/* fetch superglobals */
 	{
-		zend_is_auto_global(ZEND_STRL("GLOBALS") TSRMLS_CC);
+		phpdbg_is_auto_global(ZEND_STRL("GLOBALS") TSRMLS_CC);
 		/* might be JIT */
-		zend_is_auto_global(ZEND_STRL("_ENV") TSRMLS_CC);
-		zend_is_auto_global(ZEND_STRL("_SERVER") TSRMLS_CC);
-		zend_is_auto_global(ZEND_STRL("_REQUEST") TSRMLS_CC);
-		array_init(&zv1);
-		zend_hash_copy(Z_ARRVAL(zv1), &EG(symbol_table), NULL, (void *) NULL, sizeof(zval *));
-		Z_ARRVAL(zv1)->pDestructor = NULL; /* we're operating on a copy! Don't double free zvals */
-		zend_hash_del(Z_ARRVAL(zv1), "GLOBALS", sizeof("GLOBALS")); /* do not use the reference to itself in json */
-		zend_hash_add(ht, "GLOBALS", sizeof("GLOBALS"), &zvp1, sizeof(zval *), NULL);
+		phpdbg_is_auto_global(ZEND_STRL("_ENV") TSRMLS_CC);
+		phpdbg_is_auto_global(ZEND_STRL("_SERVER") TSRMLS_CC);
+		phpdbg_is_auto_global(ZEND_STRL("_REQUEST") TSRMLS_CC);
+		array_init(&zv[1]);
+		zend_hash_copy(Z_ARRVAL(zv[1]), &EG(symbol_table).ht, NULL);
+		Z_ARRVAL(zv[1])->pDestructor = NULL; /* we're operating on a copy! Don't double free zvals */
+		zend_hash_str_del(Z_ARRVAL(zv[1]), ZEND_STRL("GLOBALS")); /* do not use the reference to itself in json */
+		zend_hash_str_add(ht, ZEND_STRL("GLOBALS"), &zv[1]);
 	}
 
-#if PHP_VERSION_ID >= 50600
 	/* save php://input */
 	{
 		php_stream *stream;
-		int len;
-		char *contents;
+		zend_string *str;
 
 		stream = php_stream_temp_create_ex(TEMP_STREAM_DEFAULT, SAPI_POST_BLOCK_SIZE, PG(upload_tmp_dir));
-		if ((len = php_stream_copy_to_mem(stream, &contents, PHP_STREAM_COPY_ALL, 0)) > 0) {
-			ZVAL_STRINGL(&zv2, contents, len, 0);
+		if ((str = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0))) {
+			ZVAL_STR(&zv[2], str);
 		} else {
-			ZVAL_EMPTY_STRING(&zv2);
+			ZVAL_EMPTY_STRING(&zv[2]);
 		}
-		Z_SET_REFCOUNT(zv2, 2);
-		zend_hash_add(ht, "input", sizeof("input"), &zvp2, sizeof(zval *), NULL);
+		Z_SET_REFCOUNT(zv[2], 1);
+		zend_hash_str_add(ht, ZEND_STRL("input"), &zv[2]);
 	}
-#endif
 
 	/* change sapi name */
 	{
 		if (sapi_module.name) {
-			ZVAL_STRING(&zv6, sapi_module.name, 0);
+			ZVAL_STRING(&zv[6], sapi_module.name);
 		} else {
-			Z_TYPE(zv6) = IS_NULL;
+			Z_TYPE_INFO(zv[6]) = IS_NULL;
 		}
-		Z_SET_REFCOUNT(zv6, 2);
-		zend_hash_add(ht, "sapi_name", sizeof("sapi_name"), &zvp6, sizeof(zval *), NULL);
+		zend_hash_str_add(ht, ZEND_STRL("sapi_name"), &zv[6]);
+		Z_SET_REFCOUNT(zv[6], 1);
 	}
 
 	/* handle modules / extensions */
 	{
-		HashPosition position;
 		zend_module_entry *module;
 		zend_extension *extension;
 		zend_llist_position pos;
 
-		array_init(&zv7);
-		for (zend_hash_internal_pointer_reset_ex(&module_registry, &position);
-		     zend_hash_get_current_data_ex(&module_registry, (void**) &module, &position) == SUCCESS;
-		     zend_hash_move_forward_ex(&module_registry, &position)) {
-			zval **value = emalloc(sizeof(zval *));
-			ALLOC_ZVAL(*value);
-			ZVAL_STRING(*value, module->name, 1);
-			zend_hash_next_index_insert(Z_ARRVAL(zv7), value, sizeof(zval *), NULL);
-		}
-		zend_hash_add(ht, "modules", sizeof("modules"), &zvp7, sizeof(zval *), NULL);
+		array_init(&zv[7]);
+		ZEND_HASH_FOREACH_PTR(&module_registry, module) {
+			zval *value = ecalloc(sizeof(zval), 1);
+			ZVAL_STRING(value, module->name);
+			zend_hash_next_index_insert(Z_ARRVAL(zv[7]), value);
+		} ZEND_HASH_FOREACH_END();
+		zend_hash_str_add(ht, ZEND_STRL("modules"), &zv[7]);
 
-		array_init(&zv8);
+		array_init(&zv[8]);
 		extension = (zend_extension *) zend_llist_get_first_ex(&zend_extensions, &pos);
 		while (extension) {
-			zval **value = emalloc(sizeof(zval *));
-			ALLOC_ZVAL(*value);
-			ZVAL_STRING(*value, extension->name, 1);
-			zend_hash_next_index_insert(Z_ARRVAL(zv8), value, sizeof(zval *), NULL);
+			zval *value = ecalloc(sizeof(zval), 1);
+			ZVAL_STRING(value, extension->name);
+			zend_hash_next_index_insert(Z_ARRVAL(zv[8]), value);
 			extension = (zend_extension *) zend_llist_get_next_ex(&zend_extensions, &pos);
 		}
-		zend_hash_add(ht, "extensions", sizeof("extensions"), &zvp8, sizeof(zval *), NULL);
+		zend_hash_str_add(ht, ZEND_STRL("extensions"), &zv[8]);
 	}
 
 	/* switch cwd */
@@ -119,74 +111,64 @@ PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) {
 		ret = VCWD_GETWD(path);
 #endif
 		if (ret) {
-			ZVAL_STRING(&zv5, path, 1);
-			Z_SET_REFCOUNT(zv5, 1);
-			zend_hash_add(ht, "cwd", sizeof("cwd"), &zvp5, sizeof(zval *), NULL);
+			ZVAL_STRING(&zv[5], path);
+			Z_SET_REFCOUNT(zv[5], 1);
+			zend_hash_str_add(ht, ZEND_STRL("cwd"), &zv[5]);
 		}
 	}
 
 	/* get system ini entries */
 	{
-		HashPosition position;
 		zend_ini_entry *ini_entry;
 
-		array_init(&zv3);
-		for (zend_hash_internal_pointer_reset_ex(EG(ini_directives), &position);
-		     zend_hash_get_current_data_ex(EG(ini_directives), (void**) &ini_entry, &position) == SUCCESS;
-		     zend_hash_move_forward_ex(EG(ini_directives), &position)) {
-			zval **value = emalloc(sizeof(zval *));
+		array_init(&zv[3]);
+		ZEND_HASH_FOREACH_PTR(EG(ini_directives), ini_entry) {
+			zval *value = ecalloc(sizeof(zval), 1);
 			if (ini_entry->modified) {
 				if (!ini_entry->orig_value) {
 					efree(value);
 					continue;
 				}
-				ALLOC_ZVAL(*value);
-				ZVAL_STRINGL(*value, ini_entry->orig_value, ini_entry->orig_value_length, 1);
+				ZVAL_STR(value, ini_entry->orig_value);
 			} else {
 				if (!ini_entry->value) {
 					efree(value);
 					continue;
 				}
-				ALLOC_ZVAL(*value);
-				ZVAL_STRINGL(*value, ini_entry->value, ini_entry->value_length, 1);
+				ZVAL_STR(value, ini_entry->value);
 			}
-			zend_hash_add(Z_ARRVAL(zv3), ini_entry->name, ini_entry->name_length, value, sizeof(zval *), NULL);
-		}
-		zend_hash_add(ht, "systemini", sizeof("systemini"), &zvp3, sizeof(zval *), NULL);
+			zend_hash_add(Z_ARRVAL(zv[3]), ini_entry->name, value);
+		} ZEND_HASH_FOREACH_END();
+		zend_hash_str_add(ht, ZEND_STRL("systemini"), &zv[3]);
 	}
 
 	/* get perdir ini entries */
 	if (EG(modified_ini_directives)) {
-		HashPosition position;
 		zend_ini_entry *ini_entry;
 
-		array_init(&zv4);
-		for (zend_hash_internal_pointer_reset_ex(EG(modified_ini_directives), &position);
-		     zend_hash_get_current_data_ex(EG(modified_ini_directives), (void**) &ini_entry, &position) == SUCCESS;
-		     zend_hash_move_forward_ex(EG(modified_ini_directives), &position)) {
-			zval **value = emalloc(sizeof(zval *));
+		array_init(&zv[4]);
+		ZEND_HASH_FOREACH_PTR(EG(ini_directives), ini_entry) {
+			zval *value = ecalloc(sizeof(zval), 1);
 			if (!ini_entry->value) {
 				efree(value);
 				continue;
 			}
-			ALLOC_ZVAL(*value);
-			ZVAL_STRINGL(*value, ini_entry->value, ini_entry->value_length, 1);
-			zend_hash_add(Z_ARRVAL(zv4), ini_entry->name, ini_entry->name_length, value, sizeof(zval *), NULL);
-		}
-		zend_hash_add(ht, "userini", sizeof("userini"), &zvp4, sizeof(zval *), NULL);
+			ZVAL_STR(value, ini_entry->value);
+			zend_hash_add(Z_ARRVAL(zv[4]), ini_entry->name, value);
+		} ZEND_HASH_FOREACH_END();
+		zend_hash_str_add(ht, ZEND_STRL("userini"), &zv[4]);
 	}
 
 	/* encode data */
 	{
 		php_serialize_data_t var_hash;
 		smart_str buf = {0};
-		zval *arrayptr = &array;
 
 		PHP_VAR_SERIALIZE_INIT(var_hash);
-		php_var_serialize(&buf, &arrayptr, &var_hash TSRMLS_CC);
+		php_var_serialize(&buf, &array, &var_hash TSRMLS_CC);
 		PHP_VAR_SERIALIZE_DESTROY(var_hash);
-		*msg = buf.c;
-		*len = buf.len;
+		*msg = buf.s->val;
+		*len = buf.s->len;
 	}
 
 	zval_dtor(&array);