summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-05-25 18:25:19 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2010-06-01 13:31:40 -0500
commit847ce6a185f9ccbc089ef24a6c402b8c99113341 (patch)
tree1c693f26cc3b5b43013b83addce46b22d04648df
parent5862d195f90cb63c53b9dc3f54e10f8b9372bcf6 (diff)
downloadhqemu-847ce6a185f9ccbc089ef24a6c402b8c99113341.zip
hqemu-847ce6a185f9ccbc089ef24a6c402b8c99113341.tar.gz
vnc: don't send invalid screen updates.
Don't send updates for screen areas which are outside the clients desktop. May happed with vnc clients which don't support the desktop resize message. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--vnc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/vnc.c b/vnc.c
index c8fe659..5fc7012 100644
--- a/vnc.c
+++ b/vnc.c
@@ -851,6 +851,7 @@ static int vnc_update_client(VncState *vs, int has_dirty)
int y;
int n_rectangles;
int saved_offset;
+ int width, height;
int n;
if (vs->output.offset && !vs->audio_cap && !vs->force_update)
@@ -872,10 +873,13 @@ static int vnc_update_client(VncState *vs, int has_dirty)
saved_offset = vs->output.offset;
vnc_write_u16(vs, 0);
- for (y = 0; y < vd->server->height; y++) {
+ width = MIN(vd->server->width, vs->client_width);
+ height = MIN(vd->server->height, vs->client_height);
+
+ for (y = 0; y < height; y++) {
int x;
int last_x = -1;
- for (x = 0; x < vd->server->width / 16; x++) {
+ for (x = 0; x < width / 16; x++) {
if (vnc_get_bit(vs->dirty[y], x)) {
if (last_x == -1) {
last_x = x;
OpenPOWER on IntegriCloud