Fix PHPDBG compilation (phpdbg_parse_variable may modify the content of input)

Author: twose

sapi/phpdbg/phpdbg_cmd.c

@@ -740,7 +740,6 @@ PHPDBG_API int phpdbg_stack_execute(phpdbg_param_t *stack, zend_bool allow_async
 PHPDBG_API char *phpdbg_read_input(const char *buffered) /* {{{ */
 {
 	char buf[PHPDBG_MAX_CMD];
-	char *cmd = NULL;
 	char *buffer = NULL;
 
 	if ((PHPDBG_G(flags) & (PHPDBG_IS_STOPPING | PHPDBG_IS_RUNNING)) != PHPDBG_IS_STOPPING) {
@@ -755,11 +754,12 @@ PHPDBG_API char *phpdbg_read_input(const char *buffered) /* {{{ */
 #endif
 			{
 				phpdbg_write("prompt", "", "%s", phpdbg_get_prompt());
-				phpdbg_consume_stdin_line(cmd = buf);
+				phpdbg_consume_stdin_line(buf);
+				buffer = estrdup(buf);
 			}
 #ifdef HAVE_PHPDBG_READLINE
 			else {
-				cmd = readline(phpdbg_get_prompt());
+				char *cmd = readline(phpdbg_get_prompt());
 				PHPDBG_G(last_was_newline) = 1;
 
 				if (!cmd) {
@@ -768,19 +768,13 @@ PHPDBG_API char *phpdbg_read_input(const char *buffered) /* {{{ */
 				}
 
 				add_history(cmd);
+				buffer = estrdup(cmd);
+				free(cmd);
 			}
 #endif
 		} else {
-			cmd = buffered;
+			buffer = estrdup(buffered);
 		}
-
-		buffer = estrdup(cmd);
-
-#ifdef HAVE_PHPDBG_READLINE
-		if (!buffered && cmd &&	!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE) && isatty(PHPDBG_G(io)[PHPDBG_STDIN].fd)) {
-			free(cmd);
-		}
-#endif
 	}
 
 	if (buffer && isspace(*buffer)) {

sapi/phpdbg/phpdbg_utils.c

@@ -424,11 +424,11 @@ static int phpdbg_parse_variable_arg_wrapper(char *name, size_t len, char *keyna
 	return callback(name, len, keyname, keylen, parent, zv);
 }
 
-PHPDBG_API int phpdbg_parse_variable(const char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_func callback, zend_bool silent) {
+PHPDBG_API int phpdbg_parse_variable(char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_func callback, zend_bool silent) {
 	return phpdbg_parse_variable_with_arg(input, len, parent, i, (phpdbg_parse_var_with_arg_func) phpdbg_parse_variable_arg_wrapper, NULL, silent, callback);
 }
 
-PHPDBG_API int phpdbg_parse_variable_with_arg(const char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_with_arg_func callback, phpdbg_parse_var_with_arg_func step_cb, zend_bool silent, void *arg) {
+PHPDBG_API int phpdbg_parse_variable_with_arg(char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_with_arg_func callback, phpdbg_parse_var_with_arg_func step_cb, zend_bool silent, void *arg) {
 	int ret = FAILURE;
 	zend_bool new_index = 1;
 	char *last_index = NULL;

sapi/phpdbg/phpdbg_utils.h

@@ -86,8 +86,8 @@ char *phpdbg_get_property_key(char *key);
 typedef int (*phpdbg_parse_var_func)(char *name, size_t len, char *keyname, size_t keylen, HashTable *parent, zval *zv);
 typedef int (*phpdbg_parse_var_with_arg_func)(char *name, size_t len, char *keyname, size_t keylen, HashTable *parent, zval *zv, void *arg);
 
-PHPDBG_API int phpdbg_parse_variable(const char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_func callback, zend_bool silent);
-PHPDBG_API int phpdbg_parse_variable_with_arg(const char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_with_arg_func callback, phpdbg_parse_var_with_arg_func step_cb, zend_bool silent, void *arg);
+PHPDBG_API int phpdbg_parse_variable(char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_func callback, zend_bool silent);
+PHPDBG_API int phpdbg_parse_variable_with_arg(char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_with_arg_func callback, phpdbg_parse_var_with_arg_func step_cb, zend_bool silent, void *arg);
 
 int phpdbg_is_auto_global(char *name, int len);