summary refs log tree commit diff stats
path: root/hw/display/qxl-render.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-06-13 15:15:31 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-06-13 15:15:31 +0100
commit592fb17691e03606ad16e36a4d52d1818721f4cd (patch)
tree3f1199c8b85eabf632de79263ef36b71117629a0 /hw/display/qxl-render.c
parent7d5bef0873abdc336c7e9f4e2ddbf30f7348342e (diff)
parent788fbf042fc6d5aaeab56757e6dad622ac5f0c21 (diff)
downloadfocaccia-qemu-592fb17691e03606ad16e36a4d52d1818721f4cd.tar.gz
focaccia-qemu-592fb17691e03606ad16e36a4d52d1818721f4cd.zip
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140613-1' into staging
spice: add mouse cursor support
qxl-render: add sanity check

# gpg: Signature made Fri 13 Jun 2014 12:22:45 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-20140613-1:
  qxl-render: add sanity check
  spice: add mouse cursor support

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/qxl-render.c')
-rw-r--r--hw/display/qxl-render.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index 84f1367716..cc2c2b1dbc 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -138,6 +138,12 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl)
         if (qemu_spice_rect_is_empty(qxl->dirty+i)) {
             break;
         }
+        if (qxl->dirty[i].left > qxl->dirty[i].right ||
+            qxl->dirty[i].top > qxl->dirty[i].bottom ||
+            qxl->dirty[i].right > qxl->guest_primary.surface.width ||
+            qxl->dirty[i].bottom > qxl->guest_primary.surface.height) {
+            continue;
+        }
         qxl_blit(qxl, qxl->dirty+i);
         dpy_gfx_update(vga->con,
                        qxl->dirty[i].left, qxl->dirty[i].top,