diff options
| author | Gonglei (Arei) <arei.gonglei@huawei.com> | 2014-01-23 13:30:57 +0000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-03-10 12:35:04 +0100 |
| commit | e3c1adf16e38714ebd761dd02517dd07760ba6d2 (patch) | |
| tree | 7a71fd3e1120bd4b307339217ad1f48777e98f55 /ui | |
| parent | 2e7bcdb99adbd8fc10ad9ddcf93bd2bf3c0f1f2d (diff) | |
| download | qemu-e3c1adf16e38714ebd761dd02517dd07760ba6d2.tar.gz qemu-e3c1adf16e38714ebd761dd02517dd07760ba6d2.tar.bz2 qemu-e3c1adf16e38714ebd761dd02517dd07760ba6d2.zip | |
vnc: Fix qemu crashed when vnc client disconnect suddenly
Hi,
When I use RealVNC viewer client (http://www.realvnc.com/) to connect vnc server,
the client disconnect suddenly, and I click reconnect button immediately, then the Qemu crashed.
In the function vnc_worker_thread_loop, will call vnc_async_encoding_start
to set the local vs->output buffer by global queue's buffer. Then send rectangles to
the vnc client call function vnc_send_framebuffer_update. Finally, Under normal circumstances,
call vnc_async_encoding_end to set the global queue'buffer by the local vs->output conversely.
When the vnc client disconnect, the job->vs->csock will be set to -1. And the current prcoess
logic will goto disconnected partion without call function vnc_async_encoding_end.
But, the function vnc_send_framebuffer_update will call buffer_reserve, which
maybe call g_realloc reset the local vs's buffer, meaning the global queue's buffer is modified also.
If anyone use the original global queue's buffer memory will cause corruption and then crash qemu.
This patch assure the function vnc_async_encoding_end being called
even though the vnc client disconnect suddenly.
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/vnc-jobs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index 2d3fce8155..a141f400b3 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -252,6 +252,8 @@ static int vnc_worker_thread_loop(VncJobQueue *queue) if (job->vs->csock == -1) { vnc_unlock_display(job->vs->vd); + /* Copy persistent encoding data */ + vnc_async_encoding_end(job->vs, &vs); goto disconnected; } @@ -278,6 +280,9 @@ static int vnc_worker_thread_loop(VncJobQueue *queue) vnc_async_encoding_end(job->vs, &vs); qemu_bh_schedule(job->vs->bh); + } else { + /* Copy persistent encoding data */ + vnc_async_encoding_end(job->vs, &vs); } vnc_unlock_output(job->vs); |