diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-07 23:14:17 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-07 23:14:17 +0400 |
| commit | 3d17219cd88a73306acd6eeff8cbae02868318c6 (patch) | |
| tree | 0fc6fbd9f710573bae5e55ce0d29caf327bfcbb6 /ext/pcre/php_pcre.c | |
| parent | 3167b49ce9533a344cb2f16fa5c815f9f81bb434 (diff) | |
| download | php-git-3d17219cd88a73306acd6eeff8cbae02868318c6.tar.gz | |
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.
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index eb77a39cb3..2c228f0230 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1375,7 +1375,7 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, int is_callable_repl if ((result = php_replace_in_subject(regex, replace, subject_entry, limit_val, is_callable_replace, &replace_count TSRMLS_CC)) != NULL) { if (!is_filter || replace_count > old_replace_count) { /* Add to return array */ - switch(zend_hash_get_current_key_ex(Z_ARRVAL_P(subject), &string_key, &num_key, 0, NULL)) + switch(zend_hash_get_current_key(Z_ARRVAL_P(subject), &string_key, &num_key, 0)) { case HASH_KEY_IS_STRING: add_assoc_str_ex(return_value, string_key->val, string_key->len, result); @@ -1824,7 +1824,7 @@ PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return } /* Add to return array */ - switch (zend_hash_get_current_key_ex(Z_ARRVAL_P(input), &string_key, &num_key, 0, NULL)) + switch (zend_hash_get_current_key(Z_ARRVAL_P(input), &string_key, &num_key, 0)) { case HASH_KEY_IS_STRING: zend_hash_update(Z_ARRVAL_P(return_value), string_key, entry); |