cvs: php-src(PHP_5_0) / NEWS /ext/mysqli mysqli.c
| From: | Georg Richter | Date: | Wed, 06 Apr 2005 06:48:14 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / NEWS /ext/mysqli mysqli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31252@lists.php.net to get a copy of this message | ||
georg Wed Apr 6 02:48:14 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/mysqli mysqli.c
Log:
MFH: fix for #32282 (segfault in mysqli_fetch_array on 64-bit)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.310&r2=1.1760.2.311&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.310 php-src/NEWS:1.1760.2.311
--- php-src/NEWS:1.1760.2.310 Tue Apr 5 10:48:26 2005
+++ php-src/NEWS Wed Apr 6 02:48:12 2005
@@ -8,6 +8,7 @@
longer then the original string). (Ilia)
- Fixed bug #32491 (File upload error - unable to create a temporary file).
(Uwe Schindler)
+- Fixed bug #32282 (Segfault in mysqli_fetch_array on 64-bit) (Georg).
- Fixed bug #28839 (SIGSEGV in interactive mode (php -a)).
(kameshj at fastmail dot fm)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.12&r2=1.43.2.13&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.43.2.12 php-src/ext/mysqli/mysqli.c:1.43.2.13
--- php-src/ext/mysqli/mysqli.c:1.43.2.12 Sun Mar 6 16:41:38 2005
+++ php-src/ext/mysqli/mysqli.c Wed Apr 6 02:48:13 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.43.2.12 2005/03/06 21:41:38 helly Exp $
+ $Id: mysqli.c,v 1.43.2.13 2005/04/06 06:48:13 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -582,7 +582,7 @@
{
MYSQL_RES *result;
zval *mysql_result;
- int fetchtype;
+ long fetchtype;
unsigned int i;
MYSQL_FIELD *fields;
MYSQL_ROW row;