Re: [Qemu-devel] [PATCH][UPDATED] Crop VNC update requests to avoid segfaults

[Thomas Tuttle <ttuttle@ttuttle.net>]

[-- Attachment #1.1: Type: text/plain, Size: 686 bytes --]

On April 08 at 21:04 EDT, Anthony Liguori hastily scribbled:
> Thomas Tuttle wrote:
> >+    if (x_position > vs->ds->width)  x_position = vs->ds->width;
> >+    if (y_position > vs->ds->height) y_position = vs->ds->height;
> >+    if (x_position + w >= vs->ds->width)  w = vs->ds->width  - x_position;
> >+    if (y_position + h >= vs->ds->height) h = vs->ds->height - y_position;
> >+    if (w < 0) w = 0;
> >+    if (h < 0) h = 0;
> 
> These last two lines aren't strictly needed since x_position cannot be > 
> than vs->ds->width due to the first check but otherwise the patch looks 
> good.

You're right.  I've attached a new version of the patch.

--Thomas Tuttle

[-- Attachment #1.2: qemu-crop-vnc-update.patch --]
[-- Type: text/plain, Size: 686 bytes --]

Index: vnc.c
===================================================================
RCS file: /sources/qemu/qemu/vnc.c,v
retrieving revision 1.13
diff -u -r1.13 vnc.c
--- vnc.c	19 Mar 2007 15:17:08 -0000	1.13
+++ vnc.c	9 Apr 2007 01:24:19 -0000
@@ -852,6 +852,11 @@
 				       int x_position, int y_position,
 				       int w, int h)
 {
+    if (x_position > vs->ds->width)  x_position = vs->ds->width;
+    if (y_position > vs->ds->height) y_position = vs->ds->height;
+    if (x_position + w >= vs->ds->width)  w = vs->ds->width  - x_position;
+    if (y_position + h >= vs->ds->height) h = vs->ds->height - y_position;
+
     int i;
     vs->need_update = 1;
     if (!incremental) {

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]