summaryrefslogtreecommitdiff
path: root/ext/mcrypt
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-10-08 19:28:21 +0200
committerAnatol Belski <ab@php.net>2016-10-08 19:28:21 +0200
commitc43a54e4fe88b61497667d63049af3e5c5b70a59 (patch)
treee2ea46d44e9fc9afd4346331c1cc9f1d55cae55f /ext/mcrypt
parentf8a6df4706d039451c25e6fbc53169020bb0fc9b (diff)
parent6f84ac721b2674dc056430c420c839f4d2fe5b74 (diff)
downloadphp-git-c43a54e4fe88b61497667d63049af3e5c5b70a59.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: fix leak
Diffstat (limited to 'ext/mcrypt')
-rw-r--r--ext/mcrypt/mcrypt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index c2c60c2b3c..24dd26e0a6 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -1299,6 +1299,7 @@ static void php_mcrypt_do_crypt(char* cipher, const char *key, size_t key_len, c
}
if (mcrypt_generic_init(td, (void *) key, (int)key_len, (void *) iv) < 0) {
+ efree(data_s);
zend_throw_error(NULL, "Mcrypt initialisation failed");
mcrypt_module_close(td);
RETURN_FALSE;