From: Anatol Belski <ab@php.net>
Date: Mon, 29 Aug 2016 16:05:47 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.11RC1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca4eeedd3619c676a9bb687be98983dbc229d69f;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix leak
---

ca4eeedd3619c676a9bb687be98983dbc229d69f
diff --cc ext/ldap/ldap.c
index c439c7358d,e709e592fa..e384f3c044
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@@ -370,7 -367,8 +370,8 @@@ PHP_FUNCTION(ldap_connect
  			int	urllen = hostlen + sizeof( "ldap://:65535" );
  
  			if (port <= 0 || port > 65535) {
+ 				efree(ld);
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid port number: %ld", port);
 +				php_error_docref(NULL, E_WARNING, "invalid port number: %ld", port);
  				RETURN_FALSE;
  			}