[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/16] vnc: move assert in vnc_worker_thread_loop
From: |
Michael Tokarev |
Subject: |
[PULL 14/16] vnc: move assert in vnc_worker_thread_loop |
Date: |
Sat, 10 Jun 2023 09:57:52 +0300 |
From: Anastasia Belova <abelova@astralinux.ru>
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index 886f9bf611..fcca7ec632 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -250,12 +250,13 @@ static int vnc_worker_thread_loop(VncJobQueue *queue)
/* 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);
--
2.39.2
- [PULL 04/16] hw/remote: Fix vfu_cfg trace offset format, (continued)
- [PULL 04/16] hw/remote: Fix vfu_cfg trace offset format, Michael Tokarev, 2023/06/10
- [PULL 05/16] block.c: add newline for "Detected format" warning, Michael Tokarev, 2023/06/10
- [PULL 06/16] meson: install keyboard maps only if necessary, Michael Tokarev, 2023/06/10
- [PULL 07/16] target/m68k/fpu_helper: Use FloatRelation enum to hold comparison result, Michael Tokarev, 2023/06/10
- [PULL 09/16] hw/i386/microvm: Simplify using object_dynamic_cast(), Michael Tokarev, 2023/06/10
- [PULL 08/16] hw/core/cpu: Simplify realize() using MACHINE_GET_CLASS() macro, Michael Tokarev, 2023/06/10
- [PULL 10/16] hw/pci/pci: Simplify pci_bar_address() using MACHINE_GET_CLASS() macro, Michael Tokarev, 2023/06/10
- [PULL 12/16] linux-user: add comments for TARGET_NR_[gs]etgroups{, 32}, Michael Tokarev, 2023/06/10
- [PULL 13/16] linux-user: Return EINVAL for getgroups() with negative gidsetsize, Michael Tokarev, 2023/06/10
- [PULL 15/16] linux-user: elfload: s/min_mmap_addr/mmap_min_addr/, Michael Tokarev, 2023/06/10
- [PULL 14/16] vnc: move assert in vnc_worker_thread_loop,
Michael Tokarev <=
- [PULL 11/16] hw/usb/hcd-ehci-pci: Simplify using DEVICE_GET_CLASS() macro, Michael Tokarev, 2023/06/10
- [PULL 16/16] linux-user: elfload: Specify -R is an option for qemu-user binaries, Michael Tokarev, 2023/06/10
- Re: [PULL 00/16] trivial patches 2023-06-10, Richard Henderson, 2023/06/10