diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-25 20:28:39 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-25 20:28:39 +0800 |
| commit | f5e56cf9707a1be547cc29f568d6f60dbdbb1e4c (patch) | |
| tree | ad643e66466c8080120a13932a4a503c1d2d5fb9 | |
| parent | 9a4c9348b1d5d533df6c876a62256a77704f29b7 (diff) | |
| download | php-git-f5e56cf9707a1be547cc29f568d6f60dbdbb1e4c.tar.gz | |
Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 4 | ||||
| -rw-r--r-- | ext/sqlite3/tests/bug72668.phpt | 24 |
3 files changed, 29 insertions, 1 deletions
@@ -75,6 +75,8 @@ PHP NEWS character). (cmb) - SQLite3: + . Fixed bug #72668 (Spurious warning when exception is thrown in user defined + function). (Laruence) . Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash). (Laruence) - Standard: diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 0e0ef09d25..c9b6686689 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -672,8 +672,10 @@ PHP_METHOD(sqlite3, querySingle) break; } default: + if (!EG(exception)) { php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db)); - RETVAL_FALSE; + } + RETVAL_FALSE; } sqlite3_finalize(stmt); } diff --git a/ext/sqlite3/tests/bug72668.phpt b/ext/sqlite3/tests/bug72668.phpt new file mode 100644 index 0000000000..ccb238f8e4 --- /dev/null +++ b/ext/sqlite3/tests/bug72668.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #72668 (Spurious warning when exception is thrown in user defined function) +--SKIPIF-- +<?php +if (!extension_loaded('sqlite3')) die('skip'); ?> +--FILE-- +<?php +function my_udf_md5($string) { + throw new \Exception("test exception\n"); +} + +$db = new SQLite3(':memory:'); +$db->createFunction('my_udf_md5', 'my_udf_md5'); + +try { + $result = $db->querySingle('SELECT my_udf_md5("test")'); + var_dump($result); +} +catch(\Exception $e) { + echo "Exception: ".$e->getMessage(); +} +?> +--EXPECT-- +Exception: test exception |