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/pgsql/pgsql.c | |
| parent | 90a2e4ba668e89e59301abfe71175b0c0d1f9b96 (diff) | |
| download | php-git-457392fa64692be0927ed641369370f02afb0420.tar.gz | |
Cheaper checks for exceptions thrown from __toString()
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 9dd08f249a..967eb05155 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4284,8 +4284,8 @@ PHP_FUNCTION(pg_copy_from) PQclear(pgsql_result); #if HAVE_PQPUTCOPYDATA ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(pg_rows), value) { - zend_string *tmp = zval_get_string(value); - if (EG(exception)) { + zend_string *tmp = zval_try_get_string(value); + if (UNEXPECTED(!tmp)) { return; } query = (char *)emalloc(ZSTR_LEN(tmp) + 2); @@ -4309,8 +4309,8 @@ PHP_FUNCTION(pg_copy_from) } #else ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(pg_rows), value) { - zend_string *tmp = zval_get_string(value); - if (EG(exception)) { + zend_string *tmp = zval_try_get_string(value); + if (UNEXPECTED(!tmp)) { return; } query = (char *)emalloc(ZSTR_LEN(tmp) + 2); @@ -5173,8 +5173,8 @@ PHP_FUNCTION(pg_send_execute) if (Z_TYPE_P(tmp) == IS_NULL) { params[i] = NULL; } else { - zend_string *tmp_str = zval_get_string(tmp); - if (EG(exception)) { + zend_string *tmp_str = zval_try_get_string(tmp); + if (UNEXPECTED(!tmp)) { _php_pgsql_free_params(params, num_params); return; } |