fmk Fri Nov 18 16:23:46 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33201 Crash when fetching some data types
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.519&r2=1.1760.2.520&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.519 php-src/NEWS:1.1760.2.520
--- php-src/NEWS:1.1760.2.519 Fri Nov 18 15:49:00 2005
+++ php-src/NEWS Fri Nov 18 16:23:45 2005
@@ -61,6 +61,7 @@
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
+- Fixed bug #33201 (Crash when fetching some data types). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.14&r2=1.137.2.15&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.14
php-src/ext/mssql/php_mssql.c:1.137.2.15
--- php-src/ext/mssql/php_mssql.c:1.137.2.14 Fri Nov 18 15:49:01 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:23:45 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.137.2.14 2005/11/18 20:49:01 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.15 2005/11/18 21:23:45 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -865,11 +865,9 @@
if ((column_type != SQLDATETIME && column_type
!= SQLDATETIM4) || MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -877,6 +875,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -935,11 +935,9 @@
if ((column_type != SQLDATETIME && column_type != SQLDATETIM4)
|| MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -947,6 +945,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
