Fixed bug #61088 (Memory leak in readline_callback_handler_install).

diff --git a/NEWS b/NEWS
index 34aabeac317277e73340d316351a8f64df296d02..c585895392ad3253f41cf9303f2713d0e9ae8b36 100644 (file)
--- 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 22521e60406c08a5e761cc9150ab56c9503c70b1..c9389fc8ebce719edef62da467d22bdc04442ce5 100644 (file)
--- 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);