diff options
| author | Anatol Belski <ab@php.net> | 2013-05-15 11:14:58 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-05-15 11:14:58 +0200 |
| commit | de82e7edf7c91afab236a087ce4900868066b5d7 (patch) | |
| tree | 144ba2884277e0b4216a588f195cafb445e7d47c /ext/mysql/php_mysql.c | |
| parent | 1a46a102d96e08d1256770ddca3e9d955bcec025 (diff) | |
| parent | 86db5fb4c2b7199dc862dfce99c345c49305ba8a (diff) | |
| download | php-git-de82e7edf7c91afab236a087ce4900868066b5d7.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 5ad7bc903d..db0e5a1fc5 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -720,7 +720,7 @@ PHP_MINFO_FUNCTION(mysql) static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL; - int user_len, passwd_len, host_len; + int user_len = 0, passwd_len = 0, host_len = 0; char *hashed_details=NULL; int hashed_details_length, port = MYSQL_PORT; long client_flags = 0; |