Browse Source

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

after every mcrypt_generic_init() call).

# This will be MFHed into 4.3.X tree after release.
PEAR_1_4DEV
Ilia Alshanetsky 23 years ago
parent
commit
00635d0807
  1. 2
      ext/mcrypt/mcrypt.c

2
ext/mcrypt/mcrypt.c

@ -223,6 +223,7 @@ PHP_INI_END()
static void php_mcrypt_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
MCRYPT td = (MCRYPT) rsrc->ptr;
mcrypt_generic_deinit(td);
mcrypt_module_close (td);
}
@ -426,6 +427,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

Loading…
Cancel
Save