@- Fixed an initialization problem in the MS-SQL problem that could cause

@  a crash in mssql_query() (Zeev)

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 9dac88a5d9d0c5936af123c272f74fab63f34434..ca61dc5a5bec92e421d395f9716d211b5b84e8bc 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -198,6 +198,11 @@ static void _close_mssql_plink(mssql_link *mssql_ptr)
 static void php_mssql_init_globals(php_mssql_globals *mssql_globals)
 {
        MS_SQL_G(num_persistent) = 0;
+       if (MS_SQL_G(compatability_mode)) {
+               MS_SQL_G(get_column_content) = php_mssql_get_column_content_with_type;
+       } else {
+               MS_SQL_G(get_column_content) = php_mssql_get_column_content_without_type;       
+       }
 }
 #endif
 
@@ -223,11 +228,6 @@ PHP_MINIT_FUNCTION(mssql)
        }
        dberrhandle((DBERRHANDLE_PROC) php_mssql_error_handler);
        dbmsghandle((DBMSGHANDLE_PROC) php_mssql_message_handler);
-       if (MS_SQL_G(compatability_mode)) {
-               MS_SQL_G(get_column_content) = php_mssql_get_column_content_with_type;
-       } else {
-               MS_SQL_G(get_column_content) = php_mssql_get_column_content_without_type;       
-       }
        if (MS_SQL_G(connect_timeout) < 1) MS_SQL_G(connect_timeout) = 1;
        dbsetlogintime(MS_SQL_G(connect_timeout));