Fixing the mssql_query to handle multiple results correct if the first result does...

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 321b30a3b1e2acc8fb8ad65d8a23942ffbaae85c..0b0313b11d452e63197d790c6339383c5c7915f0 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -1053,7 +1053,7 @@ PHP_FUNCTION(mssql_query)
                RETURN_FALSE;
        }
 
-       if ((num_fields = dbnumcols(mssql_ptr->link)) <= 0) {
+       if ((num_fields = dbnumcols(mssql_ptr->link)) <= 0 && !dbdataready(mssql_ptr->link)) {
                RETURN_TRUE;
        }
 
@@ -1067,8 +1067,10 @@ PHP_FUNCTION(mssql_query)
        result->mssql_ptr = mssql_ptr;
        result->cur_field=result->cur_row=result->num_rows=0;
 
-       result->fields = (mssql_field *) emalloc(sizeof(mssql_field)*result->num_fields);
-       result->num_rows = _mssql_fetch_batch(mssql_ptr, result, retvalue TSRMLS_CC);
+       if (num_fields > 0) {
+               result->fields = (mssql_field *) emalloc(sizeof(mssql_field)*result->num_fields);
+               result->num_rows = _mssql_fetch_batch(mssql_ptr, result, retvalue TSRMLS_CC);
+       }
        
        ZEND_REGISTER_RESOURCE(return_value, result, le_result);
 }