From 3d17219cd88a73306acd6eeff8cbae02868318c6 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 7 Apr 2014 23:14:17 +0400 Subject: Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and family require second argument to be real pointer. &(ht)->nInternalPointer should be passed instead of NULL. zend_hash_update_current_key() may work only with internal pointer. --- main/php_ini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_ini.c') diff --git a/main/php_ini.c b/main/php_ini.c index a1b2cecabc..024dbe6821 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -765,7 +765,7 @@ PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int /* Walk through config hash and alter matching ini entries using the values found in the hash */ for (zend_hash_internal_pointer_reset(source_hash); - zend_hash_get_current_key_ex(source_hash, &str, &num_index, 0, NULL) == HASH_KEY_IS_STRING; + zend_hash_get_current_key(source_hash, &str, &num_index, 0) == HASH_KEY_IS_STRING; zend_hash_move_forward(source_hash) ) { data = zend_hash_get_current_data(source_hash); -- cgit v1.2.1