diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-22 16:48:54 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-22 16:48:54 -0700 |
| commit | 5a5b63774b12e5f49c28c48fe7bec8293425b2ff (patch) | |
| tree | cad35910cf8416d2d8454406a85f1ee50f3943b4 /ext/sqlite3/tests | |
| parent | 574b9a4e609d862bc5f384ffcbbc1bcbe95b936b (diff) | |
| parent | 44f15b068d40eb3750864af54126ef25b238e412 (diff) | |
| download | php-git-5a5b63774b12e5f49c28c48fe7bec8293425b2ff.tar.gz | |
Merge branch 'pull-request/1091'
* pull-request/1091:
Stop trying to call the callback after it has thrown an exception. Also, as an exception has been thrown, there is no need to have a separate error message.
Fix freeing null segfault. Added test for behaviour.
Conflicts:
ext/sqlite3/tests/bug68760.phpt
Diffstat (limited to 'ext/sqlite3/tests')
| -rw-r--r-- | ext/sqlite3/tests/bug68760.phpt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/sqlite3/tests/bug68760.phpt b/ext/sqlite3/tests/bug68760.phpt index de89a2cf22..2ed4a1f314 100644 --- a/ext/sqlite3/tests/bug68760.phpt +++ b/ext/sqlite3/tests/bug68760.phpt @@ -7,7 +7,7 @@ if (!extension_loaded('sqlite3')) die('skip'); --FILE-- <?php function oopsFunction($a, $b) { - echo "callback"; + echo "callback".PHP_EOL; throw new \Exception("oops"); } @@ -31,6 +31,5 @@ catch(\Exception $e) { ?> --EXPECTF-- callback -Warning: SQLite3::query(): An error occurred while invoking the compare callback in %a/bug68760.php on line %i Exception: oops |