From 34c89a26010f97bc6f3321160ba82419388c2af8 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Wed, 5 Mar 2008 23:52:45 +0000 Subject: Revert patch for bug #44325 --- ext/mssql/php_mssql.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'ext/mssql/php_mssql.c') diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 822bcf15ad..7987046982 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -2067,19 +2067,14 @@ PHP_FUNCTION(mssql_bind) /* modify datalen and maxlen according to dbrpcparam documentation */ if ( (type==SQLVARCHAR) || (type==SQLCHAR) || (type==SQLTEXT) ) { /* variable-length type */ - if (is_null || Z_TYPE_PP(var) == IS_NULL) { + if (is_null) { maxlen=0; datalen=0; - } else { + } + else { convert_to_string_ex(var); - datalen = Z_STRLEN_PP(var); - value = (LPBYTE)Z_STRVAL_PP(var); - if (!datalen) { - datalen = 1; - if (maxlen == -1) { - maxlen = 1; - } - } + datalen=Z_STRLEN_PP(var); + value=(LPBYTE)Z_STRVAL_PP(var); } } else { /* fixed-length type */ -- cgit v1.2.1