cvs: php-src /ext/mysqli mysqli_api.c
| From: | Antony Dovgal | Date: | Thu, 27 Jan 2005 01:14:44 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli_api.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30173@lists.php.net to get a copy of this message | ||
tony2001 Wed Jan 26 20:14:44 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
MFB: fix segfault when invalid field offset is passed to mysqli_fetch_field_direct()
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.98&r2=1.99&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.98 php-src/ext/mysqli/mysqli_api.c:1.99
--- php-src/ext/mysqli/mysqli_api.c:1.98 Fri Jan 7 09:59:59 2005
+++ php-src/ext/mysqli/mysqli_api.c Wed Jan 26 20:14:43 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.98 2005/01/07 14:59:59 georg Exp $
+ $Id: mysqli_api.c,v 1.99 2005/01/27 01:14:43 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -752,6 +752,11 @@
}
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result");
+
+ if (offset < 0 || offset >= mysql_num_fields(result)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field offset is invalid for resultset");
+ RETURN_FALSE;
+ }
if (!(field = mysql_fetch_field_direct(result,offset))) {
RETURN_FALSE;