commit bdfca8a22f41e7ad47fd2dac71e4d1387e2c0d4e
author Anastasia Belova <abelova@astralinux.ru> Fri Jun 09 12:23:06 2023 +0300
committer Michael Tokarev <mjt@tls.msk.ru> Sat Jun 10 00:00:24 2023 +0300
tree efe4ee3ff87e1a73a9cc7f7a59e18fc8648fce8b
parent 8fbf89a9669520ac09b3ae0013ff3eb34f8cab23

vnc: move assert in vnc_worker_thread_loop

job may be NULL if queue->exit is true. Check
it before dereference job.

Fixes: f31f9c1080 ("vnc: add magic cookie to VncState")
Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

ui/vnc-jobs.c

diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index 886f9bf..fcca7ec 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -250,12 +250,13 @@
     /* Here job can only be NULL if queue->exit is true */
     job = QTAILQ_FIRST(&queue->jobs);
     vnc_unlock_queue(queue);
-    assert(job->vs->magic == VNC_MAGIC);
 
     if (queue->exit) {
         return -1;
     }
 
+    assert(job->vs->magic == VNC_MAGIC);
+
     vnc_lock_output(job->vs);
     if (job->vs->ioc == NULL || job->vs->abort == true) {
         vnc_unlock_output(job->vs);