cvs: php4(PHP_4_3) / NEWS /ext/mysql php_mysql.c

derick Fri May 16 15:07:57 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS /php4/ext/mysql php_mysql.c Log: - Fixed bug #23661: mysql_fetch_array gives no warning on an invalid result_type Index: php4/NEWS diff -u php4/NEWS:1.1247.2.203 php4/NEWS:1.1247.2.204 --- php4/NEWS:1.1247.2.203 Fri May 16 11:30:57 2003 +++ php4/NEWS Fri May 16 15:07:57 2003 @@ -41,6 +41,8 @@ - Fixed several 64-bit problems. (Dave) - Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe) +- Fixed bug #23661 (mysql_fetch_array give no warning when an invalid argument + was passed as result_type). (Derick) - Fixed bug #23606 (Unable to build --with-db4 (db4.1.25)). (Marcus) - Fixed bug #23567 (pfsockopen() returns dead connections). (Wez) - Fixed bug #23527 (PostScript Type 1 fonts do not render properly). Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.174.2.11 php4/ext/mysql/php_mysql.c:1.174.2.12 --- php4/ext/mysql/php_mysql.c:1.174.2.11 Wed Apr 23 21:39:44 2003 +++ php4/ext/mysql/php_mysql.c Fri May 16 15:07:57 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.174.2.11 2003/04/24 01:39:44 iliaa Exp $ */ +/* $Id: php_mysql.c,v 1.174.2.12 2003/05/16 19:07:57 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);