fmk Mon Mar 15 14:45:39 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix for #27594. Comuted columns does not return a column source
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.27&r2=1.86.2.28&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.27 php-src/ext/mssql/php_mssql.c:1.86.2.28
--- php-src/ext/mssql/php_mssql.c:1.86.2.27 Tue Dec 2 13:37:50 2003
+++ php-src/ext/mssql/php_mssql.c Mon Mar 15 14:45:39 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.86.2.27 2003/12/02 18:37:50 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.28 2004/03/15 19:45:39 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -996,6 +996,7 @@
column_types = (int *) emalloc(sizeof(int) * result->num_fields);
for (i=0; i<result->num_fields; i++) {
+ char *source = NULL;
char *fname = (char *)dbcolname(mssql_ptr->link,i+1);
if (*fname) {
@@ -1010,8 +1011,11 @@
j++;
}
result->fields[i].max_length = dbcollen(mssql_ptr->link,i+1);
- result->fields[i].column_source =
estrdup(dbcolsource(mssql_ptr->link,i+1));
- if (!result->fields[i].column_source) {
+ source = (char *)dbcolsource(mssql_ptr->link,i+1);
+ if (source) {
+ result->fields[i].column_source = estrdup(source);
+ }
+ else {
result->fields[i].column_source = empty_string;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
