diff options
| author | Frank M. Kromann <fmk@php.net> | 2005-11-18 21:23:45 +0000 |
|---|---|---|
| committer | Frank M. Kromann <fmk@php.net> | 2005-11-18 21:23:45 +0000 |
| commit | 478bcb175ee999901eea09062609979bb494a576 (patch) | |
| tree | deeb78285e577eb827f47db0958cf426a3ebcc8a | |
| parent | b77ccca751b48dc2afeccdb3eca5d40db8ee0bae (diff) | |
| download | php-git-478bcb175ee999901eea09062609979bb494a576.tar.gz | |
MFH: Fix #33201 Crash when fetching some data types
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.c | 16 |
2 files changed, 9 insertions, 8 deletions
@@ -61,6 +61,7 @@ PHP NEWS - 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) diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index f20cce5709..0c36ad0316 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -865,11 +865,9 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off 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 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off case SQLDECIMAL : case SQLNUMERIC : res_length += 5; + case 127 : + res_length += 20; break; } @@ -935,11 +935,9 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int 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 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int case SQLDECIMAL : case SQLNUMERIC : res_length += 5; + case 127 : + res_length += 20; break; } |