tony2001 Thu Jan 27 09:41:48 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
MFB: fix leak in mysqli_fetch_array()
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.60&r2=1.61&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.60 php-src/ext/mysqli/mysqli.c:1.61
--- php-src/ext/mysqli/mysqli.c:1.60 Sat Jan 8 08:34:03 2005
+++ php-src/ext/mysqli/mysqli.c Thu Jan 27 09:41:48 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.60 2005/01/08 13:34:03 helly Exp $
+ $Id: mysqli.c,v 1.61 2005/01/27 14:41:48 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -777,6 +777,11 @@
}
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result,
"mysqli_result");
+ if ((fetchtype & MYSQLI_BOTH) == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The result type
should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH");
+ RETURN_FALSE;
+ }
+
if (!(row = mysql_fetch_row(result))) {
RETURN_NULL();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
