diff options
| author | Anatol Belski <ab@php.net> | 2013-05-15 11:17:18 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-05-15 11:17:18 +0200 |
| commit | 077b575d51630641fbd4b664bd18cfc335f76ebe (patch) | |
| tree | 3b0590d3a847f968b721b36e81618a4cbf6f3ca7 /ext/mysql/php_mysql.c | |
| parent | 1f97fde89e5e54c4f360b07d348d0f14634808b3 (diff) | |
| parent | de82e7edf7c91afab236a087ce4900868066b5d7 (diff) | |
| download | php-git-077b575d51630641fbd4b664bd18cfc335f76ebe.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 a41f2a5cb9..ba81a95e5f 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; |