From 5cb6b6c667ba8df282a0e82b3c5f84bf12bd4d98 Mon Sep 17 00:00:00 2001
From: "Frank M. Kromann" <fmk@php.net>
Date: Wed, 29 Nov 2000 17:08:22 +0000
Subject: Fixing wring resource handle returned from mssql_query(). The error
 was introduced when adding mssql_fetch_batch().

---
 ext/mssql/php_mssql.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'ext/mssql/php_mssql.c')

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 10bde67f04..617a80a552 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -899,12 +899,12 @@ PHP_FUNCTION(mssql_query)
 		RETURN_FALSE;
 	}
 
-	result = (mssql_result *) emalloc(sizeof(mssql_result));
 	num_fields = dbnumcols(mssql_ptr->link);
 	if (num_fields <= 0) {
-		RETURN_TRUE;
+		RETURN_FALSE;
 	}
 
+	result = (mssql_result *) emalloc(sizeof(mssql_result));
 	column_types = (int *) emalloc(sizeof(int) * num_fields);
 	for (i=0; i<num_fields; i++) {
 		column_types[i] = coltype(i+1);
@@ -961,7 +961,6 @@ PHP_FUNCTION(mssql_query)
 	}
 	efree(column_types);
 	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
-	RETURN_TRUE;
 }
 /* }}} */
 
-- 
cgit v1.2.1