1 files changed, 21 insertions, 0 deletions
diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index ce66ba39ec..d4ce8ebc55 100644
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@ -858,6 +858,27 @@ readline:
 #endif
 	}
 
+	if (buffer && isspace(*buffer)) {
+		char *trimmed = buffer;
+		while (isspace(*trimmed))
+			trimmed++;
+
+		trimmed = estrdup(trimmed);
+		efree(buffer);
+		buffer = trimmed;
+	}
+
+	if (buffer && strlen(buffer)) {
+		if (PHPDBG_G(buffer)) {
+			efree(PHPDBG_G(buffer));
+		}
+		PHPDBG_G(buffer) = estrdup(buffer);
+	} else {
+		if (PHPDBG_G(buffer)) {
+			buffer = estrdup(PHPDBG_G(buffer));
+		}
+	}
+	
 	return buffer;
 } /* }}} */