diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-03-31 13:25:26 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-03-31 13:25:26 +0300 |
| commit | e8672deefc9e7fdddff0444b0bfce3e5e20b163e (patch) | |
| tree | e096044aa21f1d4f12bdc666a85d71e4c450051f /Zend/zend_operators.c | |
| parent | f9d1a47f24f4f702edeed3be372ecf60d3b2b11e (diff) | |
| download | php-git-e8672deefc9e7fdddff0444b0bfce3e5e20b163e.tar.gz | |
Convert "Unsupported operands" fatal error into EngineException (exceptions can't be thrown at compile-time yet, so unsuported operands in constant expressions are still lead to fatal error).
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 3475174513..daa3ada6ed 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -868,7 +868,7 @@ ZEND_API int ZEND_FASTCALL add_function(zval *result, zval *op1, zval *op2) /* { zendi_convert_scalar_to_number(op2, op2_copy, result); converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; /* unknown datatype */ } } @@ -921,7 +921,7 @@ ZEND_API int ZEND_FASTCALL sub_function(zval *result, zval *op1, zval *op2) /* { zendi_convert_scalar_to_number(op2, op2_copy, result); converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; /* unknown datatype */ } } @@ -968,7 +968,7 @@ ZEND_API int ZEND_FASTCALL mul_function(zval *result, zval *op1, zval *op2) /* { zendi_convert_scalar_to_number(op2, op2_copy, result); converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; /* unknown datatype */ } } @@ -1056,7 +1056,7 @@ ZEND_API int ZEND_FASTCALL pow_function(zval *result, zval *op1, zval *op2) /* { } converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; } } @@ -1127,7 +1127,7 @@ ZEND_API int ZEND_FASTCALL div_function(zval *result, zval *op1, zval *op2) /* { zendi_convert_scalar_to_number(op2, op2_copy, result); converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; /* unknown datatype */ } } @@ -1263,7 +1263,7 @@ try_again: default: ZEND_TRY_UNARY_OBJECT_OPERATION(ZEND_BW_NOT); - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; } } |