diff options
author | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
---|---|---|
committer | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
commit | ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7 (patch) | |
tree | 360c977fa1f03c2db397743988cd003e2321e44c /ext/ldap/ldap.c | |
parent | 55abb5d39501ca0fa9bc704198785b1f98c95bb2 (diff) | |
parent | 7302b72d6e6bb77446599ec29a3b89702a506025 (diff) | |
download | php-git-ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7.tar.gz |
Merge branch 'master' into openssl_aead
Diffstat (limited to 'ext/ldap/ldap.c')
-rw-r--r-- | ext/ldap/ldap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index e0faf24b16..68e8c95abd 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -1460,6 +1460,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper) value = zend_hash_get_current_data(Z_ARRVAL_P(entry)); + ZVAL_DEREF(value); if (Z_TYPE_P(value) != IS_ARRAY) { num_values = 1; } else { |