diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-08-11 06:09:46 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-08-11 06:09:46 +0100 |
| commit | dc70139d85cc5476523bfcfbefa44f3ec35e8db5 (patch) | |
| tree | 7c8fba7f50438bd4a92f8aa8bf85f2c9c8ea9173 /ext/spl/spl_iterators.c | |
| parent | 4513475a413efe61160dfc8fbb803049a13a9720 (diff) | |
| download | php-git-dc70139d85cc5476523bfcfbefa44f3ec35e8db5.tar.gz | |
update zend_make_printable_zval to take TSRM context
Diffstat (limited to 'ext/spl/spl_iterators.c')
| -rw-r--r-- | ext/spl/spl_iterators.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 29c1c17e8a..2702628280 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1270,7 +1270,7 @@ SPL_METHOD(RecursiveTreeIterator, key) } if (Z_TYPE(key) != IS_STRING) { - if (zend_make_printable_zval(&key, &key_copy)) { + if (zend_make_printable_zval(&key, &key_copy TSRMLS_CC)) { key = key_copy; } } @@ -2047,7 +2047,7 @@ SPL_METHOD(RegexIterator, accept) } ZVAL_UNDEF(&subject_copy); - use_copy = zend_make_printable_zval(subject_ptr, &subject_copy); + use_copy = zend_make_printable_zval(subject_ptr, &subject_copy TSRMLS_CC); if (use_copy) { subject = Z_STRVAL(subject_copy); subject_len = Z_STRLEN(subject_copy); @@ -2684,7 +2684,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC) } else { ZVAL_COPY_VALUE(&intern->u.caching.zstr, &intern->current.data); } - use_copy = zend_make_printable_zval(&intern->u.caching.zstr, &expr_copy); + use_copy = zend_make_printable_zval(&intern->u.caching.zstr, &expr_copy TSRMLS_CC); if (use_copy) { ZVAL_COPY(&intern->u.caching.zstr, &expr_copy); //??? INIT_PZVAL(intern->u.caching.zstr); |