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