server: Use size_t for encoding indices

pull/13/head
Andri Yngvason 2020-01-19 19:16:27 +00:00
parent 5d264bbba1
commit ebfe4382ee
1 changed files with 4 additions and 4 deletions

View File

@ -309,14 +309,14 @@ static int on_client_set_encodings(struct nvnc_client* client)
(struct rfb_client_set_encodings_msg*)(client->msg_buffer + (struct rfb_client_set_encodings_msg*)(client->msg_buffer +
client->buffer_index); client->buffer_index);
int n_encodings = MIN(MAX_ENCODINGS, ntohs(msg->n_encodings)); size_t n_encodings = MIN(MAX_ENCODINGS, ntohs(msg->n_encodings));
int n = 0; size_t n = 0;
if (client->buffer_len - client->buffer_index < if (client->buffer_len - client->buffer_index <
sizeof(*msg) + n_encodings * 4) sizeof(*msg) + n_encodings * 4)
return 0; return 0;
for (int i = 0; i < n_encodings; ++i) { for (size_t i = 0; i < n_encodings; ++i) {
enum rfb_encodings encoding = htonl(msg->encodings[i]); enum rfb_encodings encoding = htonl(msg->encodings[i]);
switch (encoding) { switch (encoding) {
@ -666,7 +666,7 @@ static void on_write_frame_done(uv_write_t* req, int status)
enum rfb_encodings choose_frame_encoding(struct nvnc_client* client) enum rfb_encodings choose_frame_encoding(struct nvnc_client* client)
{ {
for (int i = 0; i < client->n_encodings; ++i) for (size_t i = 0; i < client->n_encodings; ++i)
switch (client->encodings[i]) { switch (client->encodings[i]) {
case RFB_ENCODING_RAW: case RFB_ENCODING_RAW:
#ifdef ENABLE_TIGHT #ifdef ENABLE_TIGHT