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

Guard against unsupported pixel formats

tight-png
Andri Yngvason 2019-09-08 16:48:05 +00:00
parent ac2adbb721
commit 55051310d6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.c
View File

@ -417,7 +417,12 @@ static void send_server_init_message(struct nvnc_client *client)
msg->name_length = htonl(name_len), msg->name_length = htonl(name_len),
memcpy(msg->name_string, display->name, name_len); memcpy(msg->name_string, display->name, name_len);
rfb_pixfmt_from_fourcc(&msg->pixel_format, display->pixfmt); int rc = rfb_pixfmt_from_fourcc(&msg->pixel_format, display->pixfmt);
if (rc < 0) {
uv_close((uv_handle_t*)&client->stream_handle, cleanup_client);
return;
}
msg->pixel_format.red_max = htons(msg->pixel_format.red_max); msg->pixel_format.red_max = htons(msg->pixel_format.red_max);
msg->pixel_format.green_max = htons(msg->pixel_format.green_max); msg->pixel_format.green_max = htons(msg->pixel_format.green_max);
msg->pixel_format.blue_max = htons(msg->pixel_format.blue_max); msg->pixel_format.blue_max = htons(msg->pixel_format.blue_max);
@ -782,7 +787,8 @@ int nvnc_update_fb(struct nvnc *self, const struct nvnc_fb *fb,
return -1; return -1;
struct rfb_pixel_format server_fmt; struct rfb_pixel_format server_fmt;
rfb_pixfmt_from_fourcc(&server_fmt, fb->fourcc_format); if (rfb_pixfmt_from_fourcc(&server_fmt, fb->fourcc_format) < 0)
return -1;
struct pixman_region16 region; struct pixman_region16 region;
pixman_region_init(&region); pixman_region_init(&region);