From 843fa04404098fe3203deb4fb21707b1afc4d77c Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sun, 11 Mar 2012 09:19:38 +0000 Subject: [PATCH] Fixed bug #61088 (Memory leak in readline_callback_handler_install). --- NEWS | 4 ++++ ext/readline/readline.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 34aabeac31..c585895392 100644 --- a/NEWS +++ b/NEWS @@ -46,6 +46,10 @@ PHP NEWS . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled). (Johannes) +- Readline: + . Fixed bug #61088 (Memory leak in readline_callback_handler_install). + (Nikic, Laruence) + - Session . Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write()). (Ilia) diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 22521e6040..c9389fc8eb 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -576,9 +576,8 @@ PHP_FUNCTION(readline_callback_handler_install) FREE_ZVAL(_prepped_callback); } - MAKE_STD_ZVAL(_prepped_callback); - *_prepped_callback = *callback; - zval_copy_ctor(_prepped_callback); + ALLOC_ZVAL(_prepped_callback); + MAKE_COPY_ZVAL(&callback, _prepped_callback); rl_callback_handler_install(prompt, php_rl_callback_handler); -- 2.50.1