qxl/update_area_io: cleanup invalid parameters handling
This cleans up two additions of almost the same code in commits511b13e2c9
andccc2960d65
. While at it, make error paths consistent (always use 'break' instead of 'return'). Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Cc: Dunrong Huang <riegamaths@gmail.com> Cc: Alon Levy <alevy@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
0ec8df3974
commit
36a03e0ba5
13
hw/qxl.c
13
hw/qxl.c
|
@ -1547,20 +1547,13 @@ async_common:
|
|||
if (d->ram->update_surface > d->ssd.num_surfaces) {
|
||||
qxl_set_guest_bug(d, "QXL_IO_UPDATE_AREA: invalid surface id %d\n",
|
||||
d->ram->update_surface);
|
||||
return;
|
||||
break;
|
||||
}
|
||||
if (update.left >= update.right || update.top >= update.bottom) {
|
||||
if (update.left >= update.right || update.top >= update.bottom ||
|
||||
update.left < 0 || update.top < 0) {
|
||||
qxl_set_guest_bug(d,
|
||||
"QXL_IO_UPDATE_AREA: invalid area (%ux%u)x(%ux%u)\n",
|
||||
update.left, update.top, update.right, update.bottom);
|
||||
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) {
|
||||
|
|
Loading…
Reference in a new issue