From: Scott MacVicar <scottmac@php.net>
Date: Sat, 22 Nov 2008 11:48:38 +0000 (+0000)
Subject: Error handler isn't properly restored when using fetchObject() with SQLite
X-Git-Tag: BEFORE_HEAD_NS_CHANGES_MERGE~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32cdeaeba9d729313cea8dad9f9273554b00ac82;p=php

Error handler isn't properly restored when using fetchObject() with SQLite
---

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index fef7d48ef5..927dafe96b 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -160,16 +160,20 @@ PHP_INI_END()
 		} \
 	}
 
-#define RES_FROM_OBJECT(res, object) \
+#define RES_FROM_OBJECT_RESTORE_ERH(res, object, error_handling) \
 	{ \
 		sqlite_object *obj = (sqlite_object*) zend_object_store_get_object(object TSRMLS_CC); \
 		res = obj->u.res; \
 		if (!res) { \
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "No result set available"); \
+			if (error_handling) \
+				zend_restore_error_handling(error_handling TSRMLS_CC); \
 			RETURN_NULL(); \
 		} \
 	}
 
+#define RES_FROM_OBJECT(res, object) RES_FROM_OBJECT_RESTORE_ERH(res, object, NULL)
+
 #define PHP_SQLITE_EMPTY_QUERY \
 	if (!sql_len) { \
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot execute empty query"); \
@@ -2573,7 +2577,7 @@ PHP_FUNCTION(sqlite_fetch_object)
 			zend_restore_error_handling(&error_handling TSRMLS_CC);
 			return;
 		}
-		RES_FROM_OBJECT(res, object);
+		RES_FROM_OBJECT_RESTORE_ERH(res, object, &error_handling);
 		if (!ZEND_NUM_ARGS()) {
 			ce = zend_standard_class_def;
 		} else {