diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 01:47:22 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-06 01:47:22 +0300 |
| commit | 457392fa64692be0927ed641369370f02afb0420 (patch) | |
| tree | e83d85fadb66cffa22fc119d3df60e72f2f9a007 /ext/standard/assert.c | |
| parent | 90a2e4ba668e89e59301abfe71175b0c0d1f9b96 (diff) | |
| download | php-git-457392fa64692be0927ed641369370f02afb0420.tar.gz | |
Cheaper checks for exceptions thrown from __toString()
Diffstat (limited to 'ext/standard/assert.c')
| -rw-r--r-- | ext/standard/assert.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 6e21af6dd5..9f315d0581 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -299,8 +299,8 @@ PHP_FUNCTION(assert_options) case ASSERT_ACTIVE: oldint = ASSERTG(active); if (ac == 2) { - zend_string *value_str = zval_get_string(value); - if (EG(exception)) { + zend_string *value_str = zval_try_get_string(value); + if (UNEXPECTED(!value_str)) { return; } @@ -315,8 +315,8 @@ PHP_FUNCTION(assert_options) case ASSERT_BAIL: oldint = ASSERTG(bail); if (ac == 2) { - zend_string *value_str = zval_get_string(value); - if (EG(exception)) { + zend_string *value_str = zval_try_get_string(value); + if (UNEXPECTED(!value_str)) { return; } @@ -331,8 +331,8 @@ PHP_FUNCTION(assert_options) case ASSERT_QUIET_EVAL: oldint = ASSERTG(quiet_eval); if (ac == 2) { - zend_string *value_str = zval_get_string(value); - if (EG(exception)) { + zend_string *value_str = zval_try_get_string(value); + if (UNEXPECTED(!value_str)) { return; } @@ -347,8 +347,8 @@ PHP_FUNCTION(assert_options) case ASSERT_WARNING: oldint = ASSERTG(warning); if (ac == 2) { - zend_string *value_str = zval_get_string(value); - if (EG(exception)) { + zend_string *value_str = zval_try_get_string(value); + if (UNEXPECTED(!value_str)) { return; } @@ -377,8 +377,8 @@ PHP_FUNCTION(assert_options) case ASSERT_EXCEPTION: oldint = ASSERTG(exception); if (ac == 2) { - zend_string *val = zval_get_string(value); - if (EG(exception)) { + zend_string *val = zval_try_get_string(value); + if (UNEXPECTED(!val)) { return; } |