diff options
| author | Frank M. Kromann <fmk@php.net> | 2004-03-15 19:45:39 +0000 |
|---|---|---|
| committer | Frank M. Kromann <fmk@php.net> | 2004-03-15 19:45:39 +0000 |
| commit | 210d34a088ca63a4b38ba47ab2d49a58f53f0489 (patch) | |
| tree | a1f9d666c34cfc69c967db46a71830bca760852d | |
| parent | ed5a974ab0eec8dd3aa2b3cee208fc6fdd9d4dd7 (diff) | |
| download | php-git-210d34a088ca63a4b38ba47ab2d49a58f53f0489.tar.gz | |
MFH: Fix for #27594. Comuted columns does not return a column source
| -rw-r--r-- | ext/mssql/php_mssql.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 37b7c54f55..c03c856d64 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -996,6 +996,7 @@ static int _mssql_fetch_batch(mssql_link *mssql_ptr, mssql_result *result, int r 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 @@ 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; } |