summaryrefslogtreecommitdiff
path: root/hw/qxl.c
diff options
context:
space:
mode:
authorDunrong Huang <riegamaths@gmail.com>2012-08-31 00:44:44 +0800
committerGerd Hoffmann <kraxel@redhat.com>2012-09-12 08:09:48 +0200
commitccc2960d654a233a6ed415b37d8ff41728d817c5 (patch)
treea5f7bc8f18704bfa37403fb97819dad2add0abdb /hw/qxl.c
parentb021bd29835b0367d499e042f76afbbf4b6ee026 (diff)
downloadqemu-ccc2960d654a233a6ed415b37d8ff41728d817c5.tar.gz
qemu-ccc2960d654a233a6ed415b37d8ff41728d817c5.tar.bz2
qemu-ccc2960d654a233a6ed415b37d8ff41728d817c5.zip
qxl: dont update invalid area
This patch fixes the following error: $ ~/usr/bin/qemu-system-x86_64 -enable-kvm -m 1024 -spice port=5900,disable-ticketing -vga qxl -cdrom ~/Images/linuxmint-13-mate-dvd-32bit.iso (/home/mathslinux/usr/bin/qemu-system-x86_64:10068): SpiceWorker-CRITICAL **: red_worker.c:4599:red_update_area: condition `area->left >= 0 && area->top >= 0 && area->left < area->right && area->top < area->bottom' failed Aborted spice server terminates QEMU process if we pass invalid area to it, so dont update those invalid areas. Signed-off-by: Dunrong Huang <riegamaths@gmail.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/qxl.c')
-rw-r--r--hw/qxl.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/qxl.c b/hw/qxl.c
index 257a37d3c5..0176b1a11a 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1470,6 +1470,13 @@ async_common:
return;
}
+ if (update.left < 0 || update.top < 0 || update.left >= update.right ||
+ update.top >= update.bottom) {
+ qxl_set_guest_bug(d, "QXL_IO_UPDATE_AREA: "
+ "invalid area(%d,%d,%d,%d)\n", update.left,
+ update.right, update.top, update.bottom);
+ break;
+ }
if (async == QXL_ASYNC) {
cookie = qxl_cookie_new(QXL_COOKIE_TYPE_IO,
QXL_IO_UPDATE_AREA_ASYNC);