archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Save some strlen

Browse source
This commit is contained in:
Xinchen Hui 2014-06-26 16:11:24 +08:00
parent 4cdea779f9
commit b8e8b3fcf4
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/mysqlnd/mysqlnd.c
View file

@ -971,8 +971,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,
*/ */
net->data->compressed = mysql_flags & CLIENT_COMPRESS? TRUE:FALSE; net->data->compressed = mysql_flags & CLIENT_COMPRESS? TRUE:FALSE;
conn->user = mnd_pestrdup(user, conn->persistent); conn->user_len = strlen(user);
conn->user_len = strlen(conn->user); conn->user = mnd_pestrndup(user, conn->user_len, conn->persistent);
conn->passwd = mnd_pestrndup(passwd, passwd_len, conn->persistent); conn->passwd = mnd_pestrndup(passwd, passwd_len, conn->persistent);
conn->passwd_len = passwd_len; conn->passwd_len = passwd_len;
conn->port = port; conn->port = port;
@ -985,12 +985,12 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,
} }
if (!unix_socket && !named_pipe) { if (!unix_socket && !named_pipe) {
conn->host = mnd_pestrdup(host, conn->persistent); conn->host = mnd_pestrndup(host, host_len, conn->persistent);
if (!conn->host) { if (!conn->host) {
SET_OOM_ERROR(*conn->error_info); SET_OOM_ERROR(*conn->error_info);
goto err; /* OOM */ goto err; /* OOM */
} }
conn->host_len = strlen(conn->host); conn->host_len = host_len;
{ {
char *p; char *p;
mnd_sprintf(&p, 0, "%s via TCP/IP", conn->host); mnd_sprintf(&p, 0, "%s via TCP/IP", conn->host);
@ -2253,7 +2253,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, change_user)(MYSQLND_CONN_DATA * const conn,
} }
/* XXX: passwords that have \0 inside work during auth, but in this case won't work with change user */ /* XXX: passwords that have \0 inside work during auth, but in this case won't work with change user */
ret = mysqlnd_run_authentication(conn, user, passwd, strlen(passwd), db, strlen(db), ret = mysqlnd_run_authentication(conn, user, passwd, passwd_len, db, strlen(db),
conn->auth_plugin_data, conn->auth_plugin_data_len, conn->options->auth_protocol, conn->auth_plugin_data, conn->auth_plugin_data_len, conn->options->auth_protocol,
0 /*charset not used*/, conn->options, conn->server_capabilities, silent, TRUE/*is_change*/ TSRMLS_CC); 0 /*charset not used*/, conn->options, conn->server_capabilities, silent, TRUE/*is_change*/ TSRMLS_CC);

2
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -159,7 +159,7 @@ php_mysqlnd_net_field_length(zend_uchar **packet)
uint64_t uint64_t
php_mysqlnd_net_field_length_ll(zend_uchar **packet) php_mysqlnd_net_field_length_ll(zend_uchar **packet)
{ {
register zend_uchar *p= (zend_uchar *)*packet; register zend_uchar *p = (zend_uchar *)*packet;
if (*p < 251) { if (*p < 251) {
(*packet)++; (*packet)++;