MFH: Fixed bug #26042 (memory leak if mcrypt_generic_deinit() is not called

after every mcrypt_generic_init() call).

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 2bcf2444835a16d93c21aa0c995ff1ac608d5644..27dfde6d4262ec6460d23c23ce6bc235fc26efc0 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -251,6 +251,7 @@ static void php_mcrypt_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
 #if HAVE_LIBMCRYPT24
        MCRYPT td = (MCRYPT) rsrc->ptr;
+       mcrypt_generic_deinit(td);
        mcrypt_module_close (td);
 #endif
 }
@@ -499,6 +500,7 @@ PHP_FUNCTION(mcrypt_generic_init)
        }
        memcpy (iv_s, Z_STRVAL_PP(iv), iv_size);
 
+       mcrypt_generic_deinit(td);
        result = mcrypt_generic_init (td, key_s, key_size, iv_s);
 
        /* If this function fails, close the mcrypt module to prevent crashes