RPJosh
/
neatvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return failure if display buffer is not set in on_connect

pull/42/head
Andri Yngvason 2020-07-18 14:04:12 +00:00
parent 683776cdf0
commit eb4b9d71a4
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/server.c
View File

@ -711,12 +711,16 @@ static void on_connection(void* obj)
client->server = server; client->server = server;
int fd = accept(server->fd, NULL, 0); int fd = accept(server->fd, NULL, 0);
if (fd < 0) if (fd < 0) {
log_debug("Failed to accept a connection\n");
goto accept_failure; goto accept_failure;
}
client->net_stream = stream_new(fd, on_client_event, client); client->net_stream = stream_new(fd, on_client_event, client);
if (!client->net_stream) if (!client->net_stream) {
log_debug("OOM\n");
goto stream_failure; goto stream_failure;
}
int rc = deflateInit2(&client->z_stream, int rc = deflateInit2(&client->z_stream,
/* compression level: */ 1, /* compression level: */ 1,
@ -725,19 +729,30 @@ static void on_connection(void* obj)
/* mem level: */ 9, /* mem level: */ 9,
/* strategy: */ Z_DEFAULT_STRATEGY); /* strategy: */ Z_DEFAULT_STRATEGY);
if (rc != Z_OK) if (rc != Z_OK) {
log_debug("OOM\n");
goto deflate_failure; goto deflate_failure;
}
if (!server->display->buffer) {
log_debug("No display buffer has been set\n");
goto buffer_failure;
}
int width = server->display->buffer->width; int width = server->display->buffer->width;
int height = server->display->buffer->height; int height = server->display->buffer->height;
if (tight_encoder_init(&client->tight_encoder, width, height) < 0) if (tight_encoder_init(&client->tight_encoder, width, height) < 0) {
log_debug("OOM\n");
goto tight_failure; goto tight_failure;
}
pixman_region_init(&client->damage); pixman_region_init(&client->damage);
struct rcbuf* payload = rcbuf_from_string(RFB_VERSION_MESSAGE); struct rcbuf* payload = rcbuf_from_string(RFB_VERSION_MESSAGE);
if (!payload) if (!payload) {
log_debug("OOM\n");
goto payload_failure; goto payload_failure;
}
stream_send(client->net_stream, payload, NULL, NULL); stream_send(client->net_stream, payload, NULL, NULL);
@ -753,6 +768,7 @@ payload_failure:
tight_encoder_destroy(&client->tight_encoder); tight_encoder_destroy(&client->tight_encoder);
pixman_region_fini(&client->damage); pixman_region_fini(&client->damage);
tight_failure: tight_failure:
buffer_failure:
deflateEnd(&client->z_stream); deflateEnd(&client->z_stream);
deflate_failure: deflate_failure:
stream_destroy(client->net_stream); stream_destroy(client->net_stream);
@ -760,8 +776,6 @@ stream_failure:
close(fd); close(fd);
accept_failure: accept_failure:
free(client); free(client);
log_debug("Failed to accept a connection\n");
} }
static int bind_address(const char* name, int port) static int bind_address(const char* name, int port)