cvs: php4 /ext/mysql php_mysql.c
| From: | Derick Rethans | Date: | Fri, 16 May 2003 19:09:20 +0000 |
| Subject: | cvs: php4 /ext/mysql php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20968@lists.php.net to get a copy of this message | ||
derick Fri May 16 15:09:20 2003 EDT
Modified files:
/php4/ext/mysql php_mysql.c
Log:
- MFB: Fixed bug #23661: mysql_fetch_array gives no warning on an invalid
result_type
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.188 php4/ext/mysql/php_mysql.c:1.189
--- php4/ext/mysql/php_mysql.c:1.188 Fri Apr 11 05:53:01 2003
+++ php4/ext/mysql/php_mysql.c Fri May 16 15:09:19 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.188 2003/04/11 09:53:01 derick Exp $ */
+/* $Id: php_mysql.c,v 1.189 2003/05/16 19:09:19 derick Exp $ */
/* TODO:
*
@@ -1875,6 +1875,10 @@
default:
WRONG_PARAM_COUNT;
break;
+ }
+
+ if ((result_type & MYSQL_BOTH) == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The result type should be either MYSQL_NUM,
MYSQL_ASSOC or MYSQL_BOTH.");
}
ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL result", le_result);