com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/mcrypt/mcrypt.c
| From: | Anatol Belski | Date: | Sat, 08 Oct 2016 17:28:21 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/mcrypt/mcrypt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94870@lists.php.net to get a copy of this message | ||
Commit: c43a54e4fe88b61497667d63049af3e5c5b70a59
Author: Anatol Belski <ab@php.net> Sat, 8 Oct 2016 19:28:21 +0200
Parents: f8a6df4706d039451c25e6fbc53169020bb0fc9b 6f84ac721b2674dc056430c420c839f4d2fe5b74
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c43a54e4fe88b61497667d63049af3e5c5b70a59
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak
Changed paths:
MM ext/mcrypt/mcrypt.c
Diff:
diff --cc ext/mcrypt/mcrypt.c
index c2c60c2,e7bdd43..24dd26e
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@@ -1299,7 -1299,8 +1299,8 @@@ static void php_mcrypt_do_crypt(char* c
}
if (mcrypt_generic_init(td, (void *) key, (int)key_len, (void *) iv) < 0) {
+ efree(data_s);
- php_error_docref(NULL, E_RECOVERABLE_ERROR, "Mcrypt initialisation failed");
+ zend_throw_error(NULL, "Mcrypt initialisation failed");
mcrypt_module_close(td);
RETURN_FALSE;
}