From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 25 May 2010 16:25:19 +0000 (+0200)
Subject: vnc: don't send invalid screen updates.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=847ce6a185f9ccbc089ef24a6c402b8c99113341;p=qemu.git

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>
---

diff --git a/vnc.c b/vnc.c
index c8fe659a13..5fc7012eb9 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;