diff options
| author | Zeev Suraski <zeev@php.net> | 1999-04-13 22:09:59 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-04-13 22:09:59 +0000 |
| commit | 76ceb9ad44106df47b7d6faa81160926574509aa (patch) | |
| tree | edde649de8f5e616ac851724f50d07d884eeebb5 | |
| parent | 7c2155c1adc9bc0f7ebe7a8fce0f4f86aadba7cc (diff) | |
| download | php-git-76ceb9ad44106df47b7d6faa81160926574509aa.tar.gz | |
Better detection
| -rw-r--r-- | Zend/zend_execute.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index d5de1b9f87..7b5ddd34a5 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1236,16 +1236,14 @@ binary_assign_op_addr: { zval tmp; if ((opline>EG(active_op_array)->opcodes) - && (opline-1)->opcode == ZEND_JMP_NO_CTOR) { + && opline->op1.op_type==IS_VAR + && opline->op1.u.EA.type & EXT_TYPE_UNUSED) { /* constructor call */ - if (opline->op1.op_type==IS_VAR) { - EG(AiCount)++; - } + EG(AiCount)++; /* for op1 */ if (opline->op2.op_type==IS_VAR) { EG(AiCount)++; } } - function_name = get_zval_ptr(&opline->op2, Ts, &free_op2, BP_VAR_R); tmp = *function_name; |