fmk Fri Nov 18 16:22:51 2005 EDT
Modified files:
/php-src NEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #33201 Crash when fetching some data types
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2082&r2=1.2083&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2082 php-src/NEWS:1.2083
--- php-src/NEWS:1.2082 Fri Nov 18 15:48:19 2005
+++ php-src/NEWS Fri Nov 18 16:22:40 2005
@@ -29,3 +29,4 @@
- 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)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.158&r2=1.159&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.158 php-src/ext/mssql/php_mssql.c:1.159
--- php-src/ext/mssql/php_mssql.c:1.158 Fri Nov 18 15:48:22 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:22:50 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.158 2005/11/18 20:48:22 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.159 2005/11/18 21:22:50 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -891,11 +891,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 :
@@ -903,6 +901,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -961,11 +961,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 :
@@ -973,6 +971,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
