diff options
| author | Andi Gutmans <andi@php.net> | 2000-02-16 09:20:10 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-02-16 09:20:10 +0000 |
| commit | f79688e8489145e67f6f76ca7cd0c3dbbe652a54 (patch) | |
| tree | 6caf94c78b325638d376e3c84220424817a9bede /Zend | |
| parent | acddf10f807f16e488cb31a0ecf5c6730d3230a9 (diff) | |
| download | php-git-f79688e8489145e67f6f76ca7cd0c3dbbe652a54.tar.gz | |
- Fix bug #3309
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index e4d69c721e..700bf405c9 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1248,7 +1248,9 @@ binary_assign_op_addr: { NEXT_OPCODE(); case ZEND_FETCH_UNSET: zend_fetch_var_address(&opline->result, &opline->op1, &opline->op2, Ts, BP_VAR_R ELS_CC); - AI_USE_PTR(Ts[opline->result.u.var].var); + if (Ts[opline->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL(Ts[opline->result.u.var].var.ptr_ptr); + } NEXT_OPCODE(); case ZEND_FETCH_IS: zend_fetch_var_address(&opline->result, &opline->op1, &opline->op2, Ts, BP_VAR_IS ELS_CC); @@ -1282,11 +1284,15 @@ binary_assign_op_addr: { } NEXT_OPCODE(); case ZEND_FETCH_DIM_UNSET: + /* Not needed in DIM_UNSET if (opline->extended_value == ZEND_FETCH_ADD_LOCK) { PZVAL_LOCK(*Ts[opline->op1.u.var].var.ptr_ptr); } + */ zend_fetch_dimension_address(&opline->result, &opline->op1, &opline->op2, Ts, BP_VAR_R ELS_CC); - AI_USE_PTR(Ts[opline->result.u.var].var); + if (Ts[opline->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL(Ts[opline->result.u.var].var.ptr_ptr); + } NEXT_OPCODE(); case ZEND_FETCH_OBJ_R: zend_fetch_property_address(&opline->result, &opline->op1, &opline->op2, Ts, BP_VAR_R ELS_CC); @@ -1313,7 +1319,9 @@ binary_assign_op_addr: { NEXT_OPCODE(); case ZEND_FETCH_OBJ_UNSET: zend_fetch_property_address(&opline->result, &opline->op1, &opline->op2, Ts, BP_VAR_R ELS_CC); - AI_USE_PTR(Ts[opline->result.u.var].var); + if (Ts[opline->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL(Ts[opline->result.u.var].var.ptr_ptr); + } NEXT_OPCODE(); case ZEND_FETCH_DIM_TMP_VAR: zend_fetch_dimension_address_from_tmp_var(&opline->result, &opline->op1, &opline->op2, Ts ELS_CC); |