diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-12 15:30:58 +0200 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2015-10-30 17:18:31 +0000 |
| commit | 5c7e248445f95c3fa2627532780950cf604b9e20 (patch) | |
| tree | b9f6ed5161dec880bb15f349a29387a764c4214e | |
| parent | 2eb732bd4d7cce9ed4e93f8640b15262c90bf79a (diff) | |
| download | spice-5c7e248445f95c3fa2627532780950cf604b9e20.tar.gz spice-5c7e248445f95c3fa2627532780950cf604b9e20.tar.xz spice-5c7e248445f95c3fa2627532780950cf604b9e20.zip | |
worker: remove assertion on alloc_drawable
There is no guarantee in the code that this can't be hit, so we should
cope with it (the condition can be reached easily by running the server
without waiting for blocked clients or pipe size)
The following commit will attempt to address this.
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
| -rw-r--r-- | server/red_worker.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index 5cb551b1..3b50c3d7 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -3513,7 +3513,9 @@ static void free_one_drawable(RedWorker *worker, int force_glz_free) Drawable *drawable; Container *container; - spice_assert(ring_item); + if (!ring_item) { + return; + } drawable = SPICE_CONTAINEROF(ring_item, Drawable, list_link); if (force_glz_free) { RingItem *glz_item, *next_item; |