iliaa Wed Oct 19 10:11:57 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql mysql_statement.c
/php-src NEWS
Log:
MFH: Fixed bug #34623 (Crash in pdo_mysql on longtext fields).
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.48.2.3&r2=1.48.2.4&ty=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.3
php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.4
--- php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.3 Thu Sep 29 15:56:35 2005
+++ php-src/ext/pdo_mysql/mysql_statement.c Wed Oct 19 10:11:56 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_statement.c,v 1.48.2.3 2005/09/29 19:56:35 helly Exp $ */
+/* $Id: mysql_statement.c,v 1.48.2.4 2005/10/19 14:11:56 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -71,6 +71,8 @@
return 1;
}
+#define PDO_MYSQL_MAX_BUFFER 1024*1024 /* 1 megabyte */
+
static int pdo_mysql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
{
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
@@ -141,6 +143,10 @@
S->bound_result[i].buffer_length =
S->fields[i].max_length? S->fields[i].max_length:
S->fields[i].length;
+ /* work-around for
longtext and alike */
+ if
(S->bound_result[i].buffer_length > PDO_MYSQL_MAX_BUFFER) {
+
S->bound_result[i].buffer_length = PDO_MYSQL_MAX_BUFFER;
+ }
}
#if 0
printf("%d: max_length=%d length=%d
buffer_length=%d type=%d\n",
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.141&r2=1.2027.2.142&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.141 php-src/NEWS:1.2027.2.142
--- php-src/NEWS:1.2027.2.141 Wed Oct 19 07:18:14 2005
+++ php-src/NEWS Wed Oct 19 10:11:56 2005
@@ -4,7 +4,9 @@
- Fixed bug #34905 (Digest authentication does not work with Apache 1). (Ilia)
- Fixed bug #34902 (mysqli::character_set_name() - undefined method). (Tony)
- Fixed bug #34899 (Fixed sqlite extension compile failure). (Ilia)
-- Fixed bug #33829 (mime_content_type() returns text/plain for gzip and bzip
files). (Derick)
+- Fixed bug #33829 (mime_content_type() returns text/plain for gzip and bzip
+ files). (Derick)
+- Fixed bug #34623 (Crash in pdo_mysql on longtext fields). (Ilia)
17 Oct 2005, PHP 5.1 Release Candidate 3
- Fixed bug #34873 (Segmentation Fault on foreach in object). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
