Avoid unnecessary allocation (and possibly leaking) if the RedDrawable
is not valid.
Related to: rhbz#1135372
---
server/red_worker.c | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/server/red_worker.c b/server/red_worker.c
index e177b68..9f18495 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -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);
--
1.9.3
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
