diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-12-03 23:37:23 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-12-03 23:39:54 +0100 |
| commit | 46d708a1b655196afef875704672a9372260f1b2 (patch) | |
| tree | cdcbc774b722e7c964a87d5429d687a5e062e78a /Zend/zend_vm_def.h | |
| parent | ffc1ef1eed79aaacfd13b5dd2988ee25e3533875 (diff) | |
| download | php-git-46d708a1b655196afef875704672a9372260f1b2.tar.gz | |
Fix PHP-7.0 build (wrong fix for the branch)
Diffstat (limited to 'Zend/zend_vm_def.h')
| -rw-r--r-- | Zend/zend_vm_def.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 4f8dbcaea1..3fe2f1dc5a 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2142,7 +2142,7 @@ ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|CV, CONST|TMPVAR|CV) if (OP1_TYPE == IS_UNUSED && UNEXPECTED(Z_OBJ_P(object) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); FREE_UNFETCHED_OP2(); - FREE_UNFETCHED_OP_DATA(); + FREE_UNFETCHED_OP((opline+1)->op1_type, (opline+1)->op1.var); HANDLE_EXCEPTION(); } @@ -2151,6 +2151,7 @@ ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|CV, CONST|TMPVAR|CV) if (OP1_TYPE == IS_VAR && UNEXPECTED(object == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); FREE_OP2(); + FREE_UNFETCHED_OP((opline+1)->op1_type, (opline+1)->op1.var); HANDLE_EXCEPTION(); } zend_assign_to_object(UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL, object, OP1_TYPE, property_name, OP2_TYPE, (opline+1)->op1_type, (opline+1)->op1, execute_data, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property_name)) : NULL)); |