diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 5e9c68d380..70e0cf3d55 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -588,8 +588,8 @@ size_t php_mysqlnd_auth_write(void * _packet, MYSQLND_CONN_DATA * conn) if (key) { /* HASH_KEY_IS_STRING */ size_t value_len = Z_STRLEN_P(entry_value); - ca_payload_len += php_mysqlnd_net_store_length_size(key->len); - ca_payload_len += key->len; + ca_payload_len += php_mysqlnd_net_store_length_size(ZSTR_LEN(key)); + ca_payload_len += ZSTR_LEN(key); ca_payload_len += php_mysqlnd_net_store_length_size(value_len); ca_payload_len += value_len; } @@ -628,9 +628,9 @@ size_t php_mysqlnd_auth_write(void * _packet, MYSQLND_CONN_DATA * conn) size_t value_len = Z_STRLEN_P(entry_value); /* copy key */ - p = php_mysqlnd_net_store_length(p, key->len); - memcpy(p, key->val, key->len); - p+= key->len; + p = php_mysqlnd_net_store_length(p, ZSTR_LEN(key)); + memcpy(p, ZSTR_VAL(key), ZSTR_LEN(key)); + p+= ZSTR_LEN(key); /* copy value */ p = php_mysqlnd_net_store_length(p, value_len); memcpy(p, Z_STRVAL_P(entry_value), value_len); @@ -1360,8 +1360,8 @@ php_mysqlnd_rset_field_read(void * _packet, MYSQLND_CONN_DATA * conn) } else { meta->sname = ZSTR_EMPTY_ALLOC(); } - meta->name = meta->sname->val; - meta->name_length = meta->sname->len; + meta->name = ZSTR_VAL(meta->sname); + meta->name_length = ZSTR_LEN(meta->sname); /* Now do allocs */ if (meta->catalog && meta->catalog != mysqlnd_empty_string) { |