From: Date: June 28 2007 2:00pm
Subject: PHP mysqlnd svn commit: r561 - in trunk: php5/ext/mysql php6/ext/mysql
List-Archive: http://lists.mysql.com/commits/29844
Message-Id: <200706281200.l5SC0L1k019088@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: ahristov
Date: 2007-06-28 14:00:21 +0200 (Thu, 28 Jun 2007)
New Revision: 561

Modified:
   trunk/php5/ext/mysql/php_mysql.c
   trunk/php6/ext/mysql/php_mysql.c
Log:
Fix crash in 003.phpt


Modified: trunk/php5/ext/mysql/php_mysql.c
===================================================================
--- trunk/php5/ext/mysql/php_mysql.c	2007-06-28 11:53:41 UTC (rev 560)
+++ trunk/php5/ext/mysql/php_mysql.c	2007-06-28 12:00:21 UTC (rev 561)
@@ -2045,7 +2045,8 @@
 #endif
 
 #ifdef ZEND_ENGINE_2
-	if (into_object) {
+	/* mysqlnd might return FALSE if no more rows */
+	if (into_object && Z_TYPE_P(return_value) != IS_BOOL) {
 		zval dataset = *return_value;
 		zend_fcall_info fci;
 		zend_fcall_info_cache fcc;

Modified: trunk/php6/ext/mysql/php_mysql.c
===================================================================
--- trunk/php6/ext/mysql/php_mysql.c	2007-06-28 11:53:41 UTC (rev 560)
+++ trunk/php6/ext/mysql/php_mysql.c	2007-06-28 12:00:21 UTC (rev 561)
@@ -2019,7 +2019,8 @@
 	mysqlnd_fetch_into(mysql_result, MYSQLND_FETCH_ASSOC, return_value, MYSQLND_MYSQL);
 #endif
 
-	if (into_object) {
+	/* mysqlnd might return FALSE if no more rows */
+	if (into_object && Z_TYPE_P(return_value) != IS_BOOL) {
 		zval dataset = *return_value;
 		zend_fcall_info fci;
 		zend_fcall_info_cache fcc;