diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-19 12:03:01 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-19 12:03:01 +0400 |
| commit | 9067dbcd0d8d8bed6c723d274b162182f33281ea (patch) | |
| tree | 2fedfa4a81b1c495979acdce75d0898e5d406aae /Zend/zend_execute_API.c | |
| parent | 6a3a33405b4dbe55a2ca70b1162a79125b6dd2d6 (diff) | |
| download | php-git-9067dbcd0d8d8bed6c723d274b162182f33281ea.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index bf43338546..bbed28d783 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -511,7 +511,7 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope actual_len -= (actual - Z_STRVAL_P(p)); if (inline_change) { zend_string *s = STR_INIT(actual, actual_len, 0); - STR_RELEASE(Z_STR_P(p)); +//??? STR_RELEASE(Z_STR_P(p)); Z_STR_P(p) = s; } } @@ -531,12 +531,12 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope zend_error(E_ERROR, "Undefined constant '%s'", save->val); } if (inline_change) { - STR_RELEASE(save); +//??? STR_RELEASE(save); } save = NULL; } if (inline_change && save && save->val != actual) { - STR_RELEASE(save); +//??? STR_RELEASE(save); } zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", actual, actual); p->type = IS_STRING; @@ -546,12 +546,12 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope } } else { if (inline_change) { - STR_RELEASE(Z_STR_P(p)); +//??? STR_RELEASE(Z_STR_P(p)); } *p = const_value; } - Z_SET_REFCOUNT_P(p, refcount); + if (IS_REFCOUNTED(Z_TYPE_P(p))) Z_SET_REFCOUNT_P(p, refcount); //??? Z_SET_ISREF_TO_P(p, is_ref); } else if (Z_TYPE_P(p) == IS_CONSTANT_ARRAY) { zval *element, new_val; |