diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l
index 6245262a005..60d995526ea 100644
--- a/sapi/phpdbg/phpdbg_lexer.l
+++ b/sapi/phpdbg/phpdbg_lexer.l
@@ -160,8 +160,9 @@ INPUT       ("\\"[#"']|["]("\\\\"|"\\"["]|[^\n\000"])*["]|[']("\\"[']|"\\\\"|[^\
 
 <NORMAL>{GENERIC_ID} {
 	phpdbg_init_param(yylval, STR_PARAM);
-	yylval->str = estrndup(yytext, yyleng - unescape_string(yytext));
-	yylval->len = yyleng;
+	size_t len = yyleng - unescape_string(yytext);
+	yylval->str = estrndup(yytext, len);
+	yylval->len = len;
 	return T_ID;
 }
 
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 1fa15ecdb0c..92c139fa52a 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -168,6 +168,10 @@ static inline int phpdbg_call_register(phpdbg_param_t *stack) /* {{{ */
 			zend_call_known_function(user_fn, NULL, NULL, NULL, 0, NULL, params_ht);
 			phpdbg_out("\n");
 
+			if (params_ht) {
+				zend_array_destroy(params_ht);
+			}
+
 			return SUCCESS;
 		}
 	}
diff --git a/sapi/phpdbg/tests/register_function_leak.phpt b/sapi/phpdbg/tests/register_function_leak.phpt
new file mode 100644
index 00000000000..b5416ea95bc
--- /dev/null
+++ b/sapi/phpdbg/tests/register_function_leak.phpt
@@ -0,0 +1,24 @@
+--TEST--
+registering a function and calling it leaks arguments memory
+--FILE--
+<?php
+echo "Done\n";
+?>
+--PHPDBG--
+register var_dump
+var_dump "a" "b"
+register flush
+flush
+r
+q
+--EXPECTF--
+[Successful compilation of %s]
+prompt> [Registered var_dump]
+prompt> string(1) "a"
+string(1) "b"
+
+prompt> [Registered flush]
+prompt> 
+prompt> Done
+[Script ended normally]
+prompt>