archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed reference counting

Browse source
This commit is contained in:
Dmitry Stogov 2014-03-21 21:34:15 +04:00
parent 130e48d375
commit a4280c340b
1 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Zend/zend_variables.c
View file

@ -331,39 +331,25 @@ ZEND_API int zval_copy_static_var(zval *p TSRMLS_DC, int num_args, va_list args,
if (is_ref) { if (is_ref) {
ZVAL_NEW_REF(&tmp, &tmp); ZVAL_NEW_REF(&tmp, &tmp);
zend_hash_add(&EG(active_symbol_table)->ht, key->key, &tmp); zend_hash_add(&EG(active_symbol_table)->ht, key->key, &tmp);
Z_ADDREF_P(p);
} else { } else {
zend_error(E_NOTICE,"Undefined variable: %s", key->key->val); zend_error(E_NOTICE,"Undefined variable: %s", key->key->val);
} }
} else { } else {
if (is_ref) { if (is_ref) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(p); SEPARATE_ZVAL_TO_MAKE_IS_REF(p);
/* Z_ADDREF_P(p);
if (!Z_ISREF_P(p)) {
if (Z_REFCOUNTED_P(p) && Z_REFCOUNT_P(p) > 1) {
Z_DELREF_P(p);
ZVAL_NEW_REF(p, p);
zval_copy_ctor(Z_REFVAL_P(p));
Z_SET_REFCOUNT_P(Z_REFVAL_P(p), 1);
} else {
ZVAL_NEW_REF(p, p);
}
}
*/
} else if (Z_ISREF_P(p)) { } else if (Z_ISREF_P(p)) {
ZVAL_COPY_VALUE(&tmp, Z_REFVAL_P(p)); ZVAL_DUP(&tmp, Z_REFVAL_P(p));
if (Z_REFCOUNTED(tmp) && Z_REFCOUNT(tmp) > 1) {
zval_copy_ctor(&tmp);
Z_SET_REFCOUNT(tmp, 0);
}
p = &tmp; p = &tmp;
} else if (Z_REFCOUNTED_P(p)) {
Z_ADDREF_P(p);
} }
} }
} } else if (Z_REFCOUNTED_P(p)) {
if (zend_hash_add(target, key->key, p)) { Z_ADDREF_P(p);
if (Z_REFCOUNTED_P(p)) { }
Z_ADDREF_P(p); zend_hash_add(target, key->key, p);
}
}
return ZEND_HASH_APPLY_KEEP; return ZEND_HASH_APPLY_KEEP;
} }
/* }}} */ /* }}} */