pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-07 18:34:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Validate RedDrawable before allocating drawable

Browse Source 
Avoid unnecessary allocation (and possibly leaking) if the RedDrawable
is not valid.

Related to: rhbz#1135372
This commit is contained in:
Marc-André Lureau 2014-10-24 15:08:35 +02:00
parent 697f3214fd
commit c9685014e7
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/red_worker.c
View File

@ -4068,6 +4068,17 @@ static Drawable *get_drawable(RedWorker *worker, uint8_t effect, RedDrawable *re
struct timespec time;
int x;
VALIDATE_SURFACE_RETVAL(worker, red_drawable->surface_id, NULL)
if (!validate_drawable_bbox(worker, red_drawable)) {
rendering_incorrect(__func__);
return NULL;
}
for (x = 0; x < 3; ++x) {
if (red_drawable->surfaces_dest[x] != -1) {
VALIDATE_SURFACE_RETVAL(worker, red_drawable->surfaces_dest[x], NULL)
}
}
while (!(drawable = alloc_drawable(worker))) {
free_one_drawable(worker, FALSE);
}
@ -4093,17 +4104,7 @@ static Drawable *get_drawable(RedWorker *worker, uint8_t effect, RedDrawable *re
drawable->group_id = group_id;
drawable->surface_id = red_drawable->surface_id;
VALIDATE_SURFACE_RETVAL(worker, drawable->surface_id, NULL)
for (x = 0; x < 3; ++x) {
drawable->surfaces_dest[x] = red_drawable->surfaces_dest[x];
if (drawable->surfaces_dest[x] != -1) {
VALIDATE_SURFACE_RETVAL(worker, drawable->surfaces_dest[x], NULL)
}
}
if (!validate_drawable_bbox(worker, red_drawable)) {
rendering_incorrect(__func__);
return NULL;
}
memcpy(drawable->surfaces_dest, red_drawable->surfaces_dest, sizeof(drawable->surfaces_dest));
ring_init(&drawable->pipes);
ring_init(&drawable->glz_ring);