]> granicus.if.org Git - php/commitdiff
Initalize some of the global vars. Crashed under ms debugger without having them...
authorShane Caraveo <shane@php.net>
Wed, 21 Feb 2001 23:57:28 +0000 (23:57 +0000)
committerShane Caraveo <shane@php.net>
Wed, 21 Feb 2001 23:57:28 +0000 (23:57 +0000)
ext/mysql/php_mysql.c

index b2a6b944947ca3854e04ed0a02b82cf4dbf5b6e8..c9c1458458316f454b7ea6cdfb9f6c729f5bd58b 100644 (file)
@@ -274,6 +274,10 @@ PHP_INI_END()
 static void php_mysql_init_globals(zend_mysql_globals *mysql_globals)
 {
        mysql_globals->num_persistent = 0;
+       mysql_globals->default_socket = NULL;
+       mysql_globals->default_host = NULL;
+       mysql_globals->default_user = NULL;
+       mysql_globals->default_password = NULL;
 }
 
 
@@ -349,10 +353,10 @@ PHP_MINFO_FUNCTION(mysql)
 
 static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 {
-       char *user, *passwd, *host_and_port, *socket, *tmp, *host=NULL;
-       char *hashed_details;
+       char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL;
+       char *hashed_details=NULL;
        int hashed_details_length, port = MYSQL_PORT;
-       MYSQL *mysql;
+       MYSQL *mysql=NULL;
        void (*handler) (int);
        zval **z_host=NULL, **z_user=NULL, **z_passwd=NULL;
        zend_bool free_host=0;