]> granicus.if.org Git - php/commitdiff
Fix for #27594. Comuted columns does not return a column source
authorFrank M. Kromann <fmk@php.net>
Mon, 15 Mar 2004 19:41:48 +0000 (19:41 +0000)
committerFrank M. Kromann <fmk@php.net>
Mon, 15 Mar 2004 19:41:48 +0000 (19:41 +0000)
ext/mssql/php_mssql.c

index 6bcda74b37d9534c1f6ab0088ef073f85c30a171..e5b079e7f2f3f71fce0c5bc96e21e66607a72c3e 100644 (file)
@@ -987,6 +987,7 @@ static int _mssql_fetch_batch(mssql_link *mssql_ptr, mssql_result *result, int r
 
        column_types = (int *) safe_emalloc(sizeof(int), result->num_fields, 0);
        for (i=0; i<result->num_fields; i++) {
+               char *source = NULL;
                char *fname = (char *)dbcolname(mssql_ptr->link,i+1);
 
                if (*fname) {
@@ -1001,8 +1002,11 @@ static int _mssql_fetch_batch(mssql_link *mssql_ptr, mssql_result *result, int r
                        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;
                }