diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-12-02 15:14:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-12-02 15:14:37 +0300 |
| commit | b3a4de65cd7f46dd7e3c0d4dabbf894d1fdcd85b (patch) | |
| tree | 6e9d49a05187fb5644dedf3a006c4da783ef9562 /Zend/zend_operators.c | |
| parent | 5a57b3d6e0c6cc86582f0f1e96fc6385eac51f58 (diff) | |
| parent | 2b70d44b57a4ec3b449c70e6deb547415c2623e7 (diff) | |
| download | php-git-b3a4de65cd7f46dd7e3c0d4dabbf894d1fdcd85b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index bf24c70154..7eab1918b0 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1642,6 +1642,10 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) / ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_CONCAT, concat_function); use_copy1 = zend_make_printable_zval(op1, &op1_copy); if (use_copy1) { + if (UNEXPECTED(EG(exception))) { + zval_dtor(&op1_copy); + return FAILURE; + } if (result == op1) { if (UNEXPECTED(op1 == op2)) { op2 = &op1_copy; @@ -1660,6 +1664,13 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) / ZEND_TRY_BINARY_OP2_OBJECT_OPERATION(ZEND_CONCAT); use_copy2 = zend_make_printable_zval(op2, &op2_copy); if (use_copy2) { + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(use_copy1)) { + zval_dtor(op1); + } + zval_dtor(&op2_copy); + return FAILURE; + } op2 = &op2_copy; } } |