[PHP-CVS] cvs: php4 /ext/mysql php_mysql.c

[Shane Caraveo]

shane           Wed Feb 21 15:57:29 2001 EDT

  Modified files:              
    /php4/ext/mysql     php_mysql.c 
  Log:
  Initalize some of the global vars.  Crashed under ms debugger without having them 
initialized.
  
  
  
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.70 php4/ext/mysql/php_mysql.c:1.71
--- php4/ext/mysql/php_mysql.c:1.70     Sun Feb 18 08:59:18 2001
+++ php4/ext/mysql/php_mysql.c  Wed Feb 21 15:57:28 2001
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
  
-/* $Id: php_mysql.c,v 1.70 2001/02/18 16:59:18 eschmid Exp $ */
+/* $Id: php_mysql.c,v 1.71 2001/02/21 23:57:28 shane Exp $ */
 
 
 /* TODO:
@@ -274,6 +274,10 @@
 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 @@
 
 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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]