cvs: php-src(PHP_5_2) /ext/mssql php_mssql.c
| From: | Frank M. Kromann | Date: | Sun, 04 Feb 2007 21:19:38 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/mssql php_mssql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42947@lists.php.net to get a copy of this message | ||
fmk Sun Feb 4 21:19:38 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mssql php_mssql.c
Log:
#39213
Fix for '' returned as ' '.
This only works with FreeTDS as microsofts library returns a length of 1 for an empty string!
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.2&r2=1.152.2.13.2.3&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.2 php-src/ext/mssql/php_mssql.c:1.152.2.13.2.3
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.2 Mon Jan 1 09:36:03 2007
+++ php-src/ext/mssql/php_mssql.c Sun Feb 4 21:19:37 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.152.2.13.2.2 2007/01/01 09:36:03 sebastian Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.3 2007/02/04 21:19:37 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -821,7 +821,7 @@
static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int offset,zval *result,
int column_type TSRMLS_DC)
{
- if (dbdatlen(mssql_ptr->link,offset) == 0) {
+ if (dbdata(mssql_ptr->link,offset) == NULL && dbdatlen(mssql_ptr->link,offset) == 0)
{
ZVAL_NULL(result);
return;
}