From 84940122a9e7898c239e97af8db13912b8e5ae91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Thu, 25 Jun 2009 09:38:04 +0000
Subject: MFH Fix bug #48679 - Crash in SQLite with count on an unbuffered
 query set (Scott)

---
 ext/sqlite/sqlite.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ext/sqlite/sqlite.c')

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index f1f8f60a27..f9b47c9a74 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -2819,6 +2819,11 @@ static int sqlite_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
 {
 	sqlite_object *obj = (sqlite_object*) zend_object_store_get_object(object TSRMLS_CC);
 
+	if (obj->u.res == NULL) {
+		zend_throw_exception(sqlite_ce_exception, "Row count is not available for this query", 0 TSRMLS_CC);
+		return FAILURE;
+	}
+
 	if (obj->u.res->buffered) {
 		* count = obj->u.res->nrows;
 		return SUCCESS;
-- 
cgit v1.2.1