From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57730 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGwwY-0000t9-2m for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGwwV-0005XI-L2 for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25181) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGwwV-0005Ws-E3 for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:23 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4PGPMh4004753 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 25 May 2010 12:25:22 -0400 From: Gerd Hoffmann Date: Tue, 25 May 2010 18:25:19 +0200 Message-Id: <1274804720-518-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1274804720-518-1-git-send-email-kraxel@redhat.com> References: <1274804720-518-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/5] vnc: don't send invalid screen updates. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- vnc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) 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; -- 1.6.6.1