[Spice-commits] server/red_worker.c

[Frediano Ziglio]

 server/red_worker.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5c7e248445f95c3fa2627532780950cf604b9e20
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu Sep 12 15:30:58 2013 +0200

    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 at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/red_worker.c b/server/red_worker.c
index 5cb551b..3b50c3d 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;