andrey Mon, 24 Jan 2011 13:58:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307711
Log:
small cleanups
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-24 12:34:47 UTC (rev
307710)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-24 13:58:18 UTC (rev
307711)
@@ -577,7 +577,7 @@
plugin_data, plugin_data_len, options, mysql_flags
TSRMLS_CC);
- ret = mysqlnd_auth_handshake(conn, user,
passwd, db, db_len, passwd_len, options, mysql_flags, greet_packet->charset_no,
+ ret = mysqlnd_auth_handshake(conn, user,
passwd, passwd_len, db, db_len, options, mysql_flags, greet_packet->charset_no,
first_call,
requested_protocol,
scrambled_data, scrambled_data_len,
@@ -2084,7 +2084,7 @@
plugin_data, plugin_data_len, 0,
conn->server_capabilities TSRMLS_CC);
- ret = mysqlnd_auth_change_user(conn, user,
strlen(user), passwd, db, strlen(db), passwd_len, silent,
+ ret = mysqlnd_auth_change_user(conn, user,
strlen(user), passwd, passwd_len, db, strlen(db), silent,
first_call,
requested_protocol,
scrambled_data, scrambled_data_len,
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c 2011-01-24 12:34:47 UTC
(rev 307710)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c 2011-01-24 13:58:18 UTC
(rev 307711)
@@ -34,9 +34,9 @@
mysqlnd_auth_handshake(MYSQLND * conn,
const char * const
user,
const char * const
passwd,
+ const size_t
passwd_len,
const char * const db,
const size_t db_len,
- const size_t
passwd_len,
const MYSQLND_OPTIONS
* const options,
unsigned long
mysql_flags,
unsigned int
server_charset_no,
@@ -158,9 +158,9 @@
const char *
const user,
const size_t
user_len,
const char *
const passwd,
+ const size_t
passwd_len,
const char *
const db,
const size_t
db_len,
- const size_t
passwd_len,
const zend_bool
silent,
zend_bool
use_full_blown_auth_packet,
const char *
const auth_protocol,
@@ -172,14 +172,7 @@
size_t *
switch_to_auth_protocol_data_len
TSRMLS_DC)
{
- /*
- User could be max 16 * 3 (utf8), pass is 20 usually, db is up to 64*3
- Stack space is not that expensive, so use a bit more to be protected
against
- buffer overflows.
- */
enum_func_status ret = FAIL;
- char buffer[MYSQLND_MAX_ALLOWED_USER_LEN + 1 + SCRAMBLE_LENGTH +
MYSQLND_MAX_ALLOWED_DB_LEN + 1 + 2 /* charset*/ ];
- char *p = buffer;
const MYSQLND_CHARSET * old_cs = conn->charset;
MYSQLND_PACKET_CHANGE_AUTH_RESPONSE * change_auth_resp_packet = NULL;
MYSQLND_PACKET_CHG_USER_RESPONSE * chg_user_resp = NULL;
@@ -230,7 +223,6 @@
if (mysqlnd_get_server_version(conn) >= 50123) {
auth_packet->charset_no = conn->charset->nr;
- p+=2;
}
if (!PACKET_WRITE(auth_packet, conn)) {
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h 2011-01-24 12:34:47 UTC
(rev 307710)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h 2011-01-24 13:58:18 UTC
(rev 307711)
@@ -203,9 +203,9 @@
mysqlnd_auth_handshake(MYSQLND * conn,
const char * const user,
const char * const passwd,
+ const size_t passwd_len,
const char * const db,
const size_t db_len,
- const size_t passwd_len,
const MYSQLND_OPTIONS * const
options,
unsigned long mysql_flags,
unsigned int server_charset_no,
@@ -224,9 +224,9 @@
const char *
const user,
const size_t
user_len,
const char *
const passwd,
+ const size_t
passwd_len,
const char *
const db,
const size_t
db_len,
- const size_t
passwd_len,
const zend_bool
silent,
zend_bool
use_full_blown_auth_packet,
const char *
const auth_protocol,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
