From: Wez Furlong <wez@php.net>
Date: Sun, 26 Sep 2004 01:41:40 +0000 (+0000)
Subject: MFH: Fix bug #30147 OO sqlite_fetch_object did not reset error handler
X-Git-Tag: php-5.0.3RC1~215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2be917266128389044b166baa714736358cfd8fb;p=php

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

diff --git a/NEWS b/NEWS
index 9892cff08b..cab8e45c24 100644
--- 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 9fc3ec860e..e51100a6d6 100644
--- 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;
 	}