iliaa Tue Mar 4 19:38:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mssql php_mssql.c
Log:
Fixed bug #44325 (mssql_bind not correctly bind empty strings as parameter
value)
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4.2.4&r2=1.152.2.13.2.4.2.5&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.4
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.5
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.4 Sun Feb 10 14:49:23 2008
+++ php-src/ext/mssql/php_mssql.c Tue Mar 4 19:38:38 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.4 2008/02/10 14:49:23 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.5 2008/03/04 19:38:38 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2067,14 +2067,19 @@
/* modify datalen and maxlen according to dbrpcparam documentation */
if ( (type==SQLVARCHAR) || (type==SQLCHAR) || (type==SQLTEXT) ) {
/* variable-length type */
- if (is_null) {
+ if (is_null || Z_TYPE_PP(var) == IS_NULL) {
maxlen=0;
datalen=0;
- }
- else {
+ } else {
convert_to_string_ex(var);
- datalen=Z_STRLEN_PP(var);
- value=(LPBYTE)Z_STRVAL_PP(var);
+ datalen = Z_STRLEN_PP(var);
+ value = (LPBYTE)Z_STRVAL_PP(var);
+ if (!datalen) {
+ datalen = 1;
+ if (maxlen == -1) {
+ maxlen = 1;
+ }
+ }
}
}
else { /* fixed-length type */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
