From: Anatol Belski <ab@php.net>
Date: Sat, 8 Oct 2016 17:28:21 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC4~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c43a54e4fe88b61497667d63049af3e5c5b70a59;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix leak
---

c43a54e4fe88b61497667d63049af3e5c5b70a59
diff --cc ext/mcrypt/mcrypt.c
index c2c60c2b3c,e7bdd43c9b..24dd26e0a6
--- 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;
  	}