diff options
| author | Veres Lajos <vlajos@gmail.com> | 2013-07-08 22:09:06 +0100 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-21 20:09:53 -0700 |
| commit | 4749457a498828e9f7919401889a991b8a9b94b5 (patch) | |
| tree | e3515ab9366020e2b422a370033c0b4f2b91d11f /ext/json/json.c | |
| parent | 29281dee491d675185ce155e7956d1617d551c4a (diff) | |
| download | php-git-4749457a498828e9f7919401889a991b8a9b94b5.tar.gz | |
HASH_KEY_NON_EXISTANT fix
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 53608412f5..782375e371 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -185,7 +185,7 @@ static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */ idx = 0; for (;; zend_hash_move_forward_ex(myht, &pos)) { i = zend_hash_get_current_key_ex(myht, &key, &key_len, &index, 0, &pos); - if (i == HASH_KEY_NON_EXISTANT) { + if (i == HASH_KEY_NON_EXISTENT) { break; } @@ -271,7 +271,7 @@ static void json_encode_array(smart_str *buf, zval **val, int options TSRMLS_DC) zend_hash_internal_pointer_reset_ex(myht, &pos); for (;; zend_hash_move_forward_ex(myht, &pos)) { i = zend_hash_get_current_key_ex(myht, &key, &key_len, &index, 0, &pos); - if (i == HASH_KEY_NON_EXISTANT) + if (i == HASH_KEY_NON_EXISTENT) break; if (zend_hash_get_current_data_ex(myht, (void **) &data, &pos) == SUCCESS) { |