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

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix leak
---

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