georg Sat Oct 15 02:32:27 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/mysqli mysqli_api.c
Log:
fixed an error in mysqli_fetch_fields (function returns NULL instead of array
when row_number > num_fields).
Thanks to Marc Deslisle and phpMyAdmin team for the report.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.128&r2=1.2027.2.129&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.128 php-src/NEWS:1.2027.2.129
--- php-src/NEWS:1.2027.2.128 Fri Oct 14 11:30:24 2005
+++ php-src/NEWS Sat Oct 15 02:32:21 2005
@@ -34,6 +34,8 @@
- Added "new_link" parameter to mssql_connect() (Bug #34369). (Frank)
- Added missing safe_mode checks for image* functions and cURL. (Ilia)
- Added missing safe_mode/open_basedir checks for file uploads. (Ilia)
+- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
+ array when row number > field_count). (Georg)
- Fixed possible INI setting leak via virtual() in Apache 2 sapi. (Ilia)
- Fixed potential GLOBALS overwrite via import_request_variables() and
possible crash and/or memory corruption. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.4&r2=1.118.2.5&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.4
php-src/ext/mysqli/mysqli_api.c:1.118.2.5
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.4 Mon Oct 10 16:06:34 2005
+++ php-src/ext/mysqli/mysqli_api.c Sat Oct 15 02:32:26 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.4 2005/10/10 20:06:34 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.118.2.5 2005/10/15 06:32:26 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -740,10 +740,6 @@
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result,
"mysqli_result");
- if (!(field = mysql_fetch_field(result))) {
- RETURN_FALSE;
- }
-
array_init(return_value);
for (i = 0; i < mysql_num_fields(result); i++) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
