diff options
| author | Andi Gutmans <andi@php.net> | 1999-10-02 18:02:10 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-10-02 18:02:10 +0000 |
| commit | 56834ff66ad728c2eaaae5afac7a0b6030c6b5ae (patch) | |
| tree | 6bf601b740386682824d42a19976a78d8cd83720 /Zend | |
| parent | e40667440df851bce4ef552b6bb4645337cdd97f (diff) | |
| download | php-git-56834ff66ad728c2eaaae5afac7a0b6030c6b5ae.tar.gz | |
- Another locking fix.
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index e4e9eeda4d..c93f8e056a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -746,12 +746,14 @@ static inline void zend_fetch_property_address(znode *result, znode *op1, znode case BP_VAR_R: case BP_VAR_IS: *retval = &EG(uninitialized_zval_ptr); - return; + break; case BP_VAR_W: case BP_VAR_RW: *retval = &EG(error_zval_ptr); - return; + break; } + SELECTIVE_PZVAL_LOCK(**retval, result); + return; } overloaded_element.element = *get_zval_ptr(op2, Ts, &free_op2, type); @@ -822,13 +824,11 @@ static inline void zend_fetch_property_address(znode *result, znode *op1, znode FREE_OP(op2, free_op2); if (type==BP_VAR_R || type==BP_VAR_IS) { *retval = &EG(uninitialized_zval_ptr); - SELECTIVE_PZVAL_LOCK(**retval, result); - return; } else { *retval = &EG(error_zval_ptr); - SELECTIVE_PZVAL_LOCK(**retval, result); - return; } + SELECTIVE_PZVAL_LOCK(**retval, result); + return; } |