From 2067ce4079e7ec7820e848a63021e49c1c93319d Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Wed, 30 Jun 2004 19:46:57 +0000 Subject: Fix for #28512. Allocate enough space to store data --- ext/mssql/php_mssql.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'ext/mssql/php_mssql.c') diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 7e501934e3..e99026b1d7 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -843,9 +843,22 @@ 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)) { - if (column_type == SQLDATETIM4) res_length += 14; - if (column_type == SQLDATETIME) res_length += 10; - + switch (column_type) { + case SQLDATETIM4 : + res_length += 14; + break; + case SQLDATETIME : + res_length += 10; + break; + case SQLMONEY : + case SQLMONEY4 : + case SQLMONEYN : + case SQLDECIMAL : + case SQLNUMERIC : + res_length += 5; + break; + } + res_buf = (unsigned char *) emalloc(res_length+1); res_length = dbconvert(NULL,coltype(offset),dbdata(mssql_ptr->link,offset), res_length, SQLCHAR,res_buf,-1); } else { @@ -909,6 +922,8 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int case SQLMONEY : case SQLMONEY4 : case SQLMONEYN : + case SQLDECIMAL : + case SQLNUMERIC : res_length += 5; break; } -- cgit v1.2.1