MFH: Fix bug #30147 OO sqlite_fetch_object did not reset error handler

diff --git a/NEWS b/NEWS
index 9892cff08b9e950dac7453be95a08989bfe2e145..cab8e45c24d46677da9942c175075a49d670a2f4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, PHP 5.0.3
+- Fixed bug #30147 (OO sqlite_fetch_object did not reset error handler). (Wez)
 - Fixed bug #30057 (did not detect IPV6 on FreeBSD 4.1). (Wez)
 
 23 Sep 2004, PHP 5.0.2

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 9fc3ec860e593e2690e1bed7f2eb6f701a073137..e51100a6d698b2c50f1793c6d04998e7ddcefe22 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -1969,6 +1969,7 @@ PHP_FUNCTION(sqlite_fetch_object)
        if (res->curr_row < res->nrows) {
                php_sqlite_fetch_array(res, PHPSQLITE_ASSOC, decode_binary, 1, &dataset TSRMLS_CC);
        } else {
+               php_std_error_handling();
                RETURN_FALSE;
        }