1
0
mirror of https://github.com/php/php-src.git synced 2026-04-10 01:23:53 +02:00

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
This commit is contained in:
Remi Collet
2014-01-20 08:40:39 +01:00

View File

@@ -354,6 +354,11 @@ PHP_FUNCTION(readline_clear_history)
return;
}
#if HAVE_LIBEDIT
/* clear_history is the only function where rl_initialize
is not call to ensure correct allocation */
using_history();
#endif
clear_history();
RETURN_TRUE;