fmk Fri Mar 19 13:46:23 2004 EDT
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
Fix for #26589. Crash when selecting many columns of type Money
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.130&r2=1.131&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.130 php-src/ext/mssql/php_mssql.c:1.131
--- php-src/ext/mssql/php_mssql.c:1.130 Mon Mar 15 14:41:48 2004
+++ php-src/ext/mssql/php_mssql.c Fri Mar 19 13:45:07 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.130 2004/03/15 19:41:48 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.131 2004/03/19 18:45:07 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -797,9 +797,12 @@
ZVAL_STRINGL(result, data, length, 1);
break;
}
+ case SQLMONEY4:
case SQLFLT4:
ZVAL_DOUBLE(result, (double) floatcol4(offset));
break;
+ case SQLMONEY:
+ case SQLMONEYN:
case SQLFLT8:
ZVAL_DOUBLE(result, (double) floatcol8(offset));
break;
@@ -891,8 +894,19 @@
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 :
+ 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);
@@ -947,6 +961,9 @@
case SQLFLT4:
case SQLFLT8:
case SQLFLTN:
+ case SQLMONEY4:
+ case SQLMONEY:
+ case SQLMONEYN:
convert_to_double_ex(&bind->zval);
Z_DVAL_P(bind->zval) =
*((double *)(dbretdata(mssql_ptr->link,i)));
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
