[Spice-commits] src/vmcstream.c

[Fabiano Fidêncio]

 src/vmcstream.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5b008c35c3edb29f82dfb458241570ca60a08a91
Author: Fabiano Fidêncio <fidencio at redhat.com>
Date:   Mon Mar 21 14:06:56 2016 +0100

    vmcstream,gtask: Fix crash when trying to use webdav
    
    Don't try to get the cancellable from a task that is, for sure (ensured
    by us), NULL. See the backtrace:
    
     #0  0x00007ffff29cf250 in g_task_get_cancellable () at /lib64/libgio-2.0.so.0
     #1  0x00007ffff78a9012 in spice_vmc_input_stream_read_all_async (stream=<optimized out>, buffer=0x7070f8, count=8, io_priority=<optimized out>, cancellable=0x7fffcc00a470, callback=0x7ffff788c190 <client_read_cb>, user_data=0x707b30) at vmcstream.c:187
     #2  0x00007ffff788c0ab in start_demux (self=0x707b30) at channel-webdav.c:498
     #3  0x00007ffff2700578 in g_closure_invoke () at /lib64/libgobject-2.0.so.0
     #4  0x00007ffff27135f0 in signal_emit_unlocked_R () at /lib64/libgobject-2.0.so.0
     #5  0x00007ffff271c43c in g_signal_emit_valist () at /lib64/libgobject-2.0.so.0
     #6  0x00007ffff788acca in emit_main_context (opaque=0x7fffbfffe880) at gio-coroutine.c:200
     #7  0x00007ffff242bab3 in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
     #8  0x00007ffff242be60 in g_main_context_iterate.isra () at /lib64/libglib-2.0.so.0
     #9  0x00007ffff242c182 in g_main_loop_run () at /lib64/libglib-2.0.so.0
     #10 0x0000000000405df6 in main (argc=<optimized out>, argv=<optimized out>) at spicy.c:1897
    
    It was pointed out during the review and, somehow, missed :-\
    
    Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
    Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/src/vmcstream.c b/src/vmcstream.c
index a206961..5ebf15a 100644
--- a/src/vmcstream.c
+++ b/src/vmcstream.c
@@ -181,7 +181,6 @@ spice_vmc_input_stream_read_all_async(GInputStream        *stream,
 
     /* no concurrent read permitted by ginputstream */
     g_return_if_fail(self->task == NULL);
-    g_return_if_fail(g_task_get_cancellable(self->task) == NULL);
     self->all = TRUE;
     self->buffer = buffer;
     self->count = count;
@@ -230,7 +229,6 @@ spice_vmc_input_stream_read_async(GInputStream        *stream,
 
     /* no concurrent read permitted by ginputstream */
     g_return_if_fail(self->task == NULL);
-    g_return_if_fail(g_task_get_cancellable(self->task) == NULL);
     self->all = FALSE;
     self->buffer = buffer;
     self->count = count;