]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 10 Oct 2019 08:08:32 +0000 (10:08 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 10 Oct 2019 08:08:32 +0000 (10:08 +0200)
1  2 
Zend/zend_execute.c

index 2c544741192bb5fc4886bc15d96597f42e53c969,b69d0a88d55e8623e0ad28e2155e61e59003a206..e6edbf6685c5a33b9c02d252924977aaf9ad3695
@@@ -2733,7 -2862,10 +2733,8 @@@ static zend_always_inline void zend_ass
                variable_ptr = &EG(uninitialized_zval);
        } else if (UNEXPECTED(Z_TYPE(variable) != IS_INDIRECT)) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
+               zval_ptr_dtor(&variable);
                variable_ptr = &EG(uninitialized_zval);
 -      } else if (/*OP_DATA_TYPE == IS_VAR &&*/ UNEXPECTED(Z_ISERROR_P(value_ptr))) {
 -              variable_ptr = &EG(uninitialized_zval);
        } else if (/*OP_DATA_TYPE == IS_VAR &&*/
                   (opline->extended_value & ZEND_RETURNS_FUNCTION) &&
                           UNEXPECTED(!Z_ISREF_P(value_ptr))) {