diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-25 17:15:10 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-25 17:15:10 +0200 |
| commit | ac0bbea3a89334b47995315cd37ca342e89486f2 (patch) | |
| tree | e261ec88fcdf6a670f3b48bcb59eafa2d7ee11e6 /ext/sqlite3/sqlite3.c | |
| parent | 2334d8335b902ec0e51f677f30bc8adcd41bf503 (diff) | |
| parent | ccf39dd55243054535be02261485d56fbe5539d5 (diff) | |
| download | php-git-ac0bbea3a89334b47995315cd37ca342e89486f2.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 96b1dd2178..66a9e488b3 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -555,7 +555,9 @@ PHP_METHOD(sqlite3, query) break; } default: - php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db)); + if (!EG(exception)) { + php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db)); + } sqlite3_finalize(stmt_obj->stmt); stmt_obj->initialised = 0; zval_dtor(return_value); @@ -1611,7 +1613,9 @@ PHP_METHOD(sqlite3stmt, execute) sqlite3_reset(stmt_obj->stmt); default: - php_sqlite3_error(stmt_obj->db_obj, "Unable to execute statement: %s", sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt))); + if (!EG(exception)) { + php_sqlite3_error(stmt_obj->db_obj, "Unable to execute statement: %s", sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt))); + } zval_dtor(return_value); RETURN_FALSE; } |