Patchwork [4/5] vnc: don't send invalid screen updates.

login
register
mail settings
Submitter Gerd Hoffmann
Date May 25, 2010, 4:25 p.m.
Message ID <1274804720-518-5-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/53560/
State New
Headers show

Comments

Gerd Hoffmann - May 25, 2010, 4:25 p.m.
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>
---
 vnc.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/vnc.c b/vnc.c
index 30e0bed..119ffe8 100644
--- a/vnc.c
+++ b/vnc.c
@@ -836,6 +836,7 @@  static int vnc_update_client(VncState *vs, int has_dirty)
         int y;
         int n_rectangles;
         int saved_offset;
+        int width, height;
 
         if (vs->output.offset && !vs->audio_cap && !vs->force_update)
             /* kernel send buffers are full -> drop frames to throttle */
@@ -856,10 +857,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;