OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vnc: move assert in vnc_worker_thread_loop

Browse Source 
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>
This commit is contained in:
Anastasia Belova 2023-06-09 12:23:06 +03:00 committed by Michael Tokarev
parent 8fbf89a966
commit bdfca8a22f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/vnc-jobs.c
View File

@ -250,12 +250,13 @@ static int vnc_worker_thread_loop(VncJobQueue *queue)
/* Here job can only be NULL if queue->exit is true */ /* Here job can only be NULL if queue->exit is true */
job = QTAILQ_FIRST(&queue->jobs); job = QTAILQ_FIRST(&queue->jobs);
vnc_unlock_queue(queue); vnc_unlock_queue(queue);
assert(job->vs->magic == VNC_MAGIC);
if (queue->exit) { if (queue->exit) {
return -1; return -1;
} }
assert(job->vs->magic == VNC_MAGIC);
vnc_lock_output(job->vs); vnc_lock_output(job->vs);
if (job->vs->ioc == NULL || job->vs->abort == true) { if (job->vs->ioc == NULL || job->vs->abort == true) {
vnc_unlock_output(job->vs); vnc_unlock_output(job->vs);