diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-04-29 13:05:44 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-04-29 13:05:44 +0100 |
| commit | 416e22d2bb496da39e95136b1eded64869f10dd0 (patch) | |
| tree | b3867606a888d0ab96524c4243c3f33b3d138225 /Zend/zend_operators.c | |
| parent | fdeb8a199e769068a0fe13b19ff58d01915e404c (diff) | |
| parent | dbdc37ac4f440abade6f9560f093b9f8ef89db05 (diff) | |
| download | php-git-416e22d2bb496da39e95136b1eded64869f10dd0.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index c1a7986650..e24d033da3 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -599,26 +599,26 @@ try_again: if (Z_OBJ_HT_P(op)->get_properties) { HashTable *obj_ht = Z_OBJ_HT_P(op)->get_properties(op); if (obj_ht) { - zval arr; + zend_array *arr; if (!Z_OBJCE_P(op)->default_properties_count && obj_ht == Z_OBJ_P(op)->properties && !ZEND_HASH_GET_APPLY_COUNT(Z_OBJ_P(op)->properties)) { /* fast copy */ if (EXPECTED(Z_OBJ_P(op)->handlers == &std_object_handlers)) { - ZVAL_ARR(&arr, obj_ht); + arr = obj_ht; if (EXPECTED(!(GC_FLAGS(Z_OBJ_P(op)->properties) & IS_ARRAY_IMMUTABLE))) { GC_REFCOUNT(Z_OBJ_P(op)->properties)++; } } else { - ZVAL_ARR(&arr, zend_array_dup(obj_ht)); + arr = zend_array_dup(obj_ht); } zval_dtor(op); - ZVAL_COPY_VALUE(op, &arr); + ZVAL_ARR(op, arr); } else { - ZVAL_ARR(&arr, zend_array_dup(obj_ht)); + arr = zend_array_dup(obj_ht); zval_dtor(op); - ZVAL_COPY_VALUE(op, &arr); + ZVAL_ARR(op, arr); } return; } @@ -2932,6 +2932,8 @@ static zend_always_inline void zend_memnstr_ex_pre(unsigned int td[], const char td[(unsigned char)needle[i]] = i + 1; } } else { + size_t i; + for (i = 0; i < needle_len; i++) { td[(unsigned char)needle[i]] = (int)needle_len - i; } |