com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/ldap/ldap.c
| From: | Anatol Belski | Date: | Mon, 29 Aug 2016 16:08:17 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/ldap/ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94116@lists.php.net to get a copy of this message | ||
Commit: 78c15e2744380692ce9347c5271eb08f3ae908ad
Author: Anatol Belski <ab@php.net> Mon, 29 Aug 2016 18:08:17 +0200
Parents: faccbeb5886fd891b11a965b2e780ea345445772 ca4eeedd3619c676a9bb687be98983dbc229d69f
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=78c15e2744380692ce9347c5271eb08f3ae908ad
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak
Changed paths:
MM ext/ldap/ldap.c
Diff:
diff --cc ext/ldap/ldap.c
index 48a925c,e384f3c..0f82354
--- 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;
}