mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmware-vga: use vmsvga_verify_rect in vmsvga_fill_rect

Browse Source 
Add verification to vmsvga_fill_rect, re-enable HW_FILL_ACCEL.

Cc: qemu-stable@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Don Koch <dkoch@verizon.com>
This commit is contained in:
Gerd Hoffmann 2014-10-06 11:59:51 +02:00
parent 61b41b4c20
commit bd9ccd8517
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/display/vmware_vga.c
View File

@ -30,9 +30,7 @@
#undef VERBOSE #undef VERBOSE
#define HW_RECT_ACCEL #define HW_RECT_ACCEL
#if 0
#define HW_FILL_ACCEL #define HW_FILL_ACCEL
#endif
#define HW_MOUSE_ACCEL #define HW_MOUSE_ACCEL
#include "vga_int.h" #include "vga_int.h"
@ -444,7 +442,7 @@ static inline int vmsvga_copy_rect(struct vmsvga_state_s *s,
#endif #endif
#ifdef HW_FILL_ACCEL #ifdef HW_FILL_ACCEL
static inline void vmsvga_fill_rect(struct vmsvga_state_s *s, static inline int vmsvga_fill_rect(struct vmsvga_state_s *s,
uint32_t c, int x, int y, int w, int h) uint32_t c, int x, int y, int w, int h)
{ {
DisplaySurface *surface = qemu_console_surface(s->vga.con); DisplaySurface *surface = qemu_console_surface(s->vga.con);
@ -457,6 +455,10 @@ static inline void vmsvga_fill_rect(struct vmsvga_state_s *s,
uint8_t *src; uint8_t *src;
uint8_t col[4]; uint8_t col[4];
if (!vmsvga_verify_rect(surface, __func__, x, y, w, h)) {
return -1;
}
col[0] = c; col[0] = c;
col[1] = c >> 8; col[1] = c >> 8;
col[2] = c >> 16; col[2] = c >> 16;
@ -481,6 +483,7 @@ static inline void vmsvga_fill_rect(struct vmsvga_state_s *s,
} }
vmsvga_update_rect_delayed(s, x, y, w, h); vmsvga_update_rect_delayed(s, x, y, w, h);
return 0;
} }
#endif #endif
@ -613,12 +616,12 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
width = vmsvga_fifo_read(s); width = vmsvga_fifo_read(s);
height = vmsvga_fifo_read(s); height = vmsvga_fifo_read(s);
#ifdef HW_FILL_ACCEL #ifdef HW_FILL_ACCEL
vmsvga_fill_rect(s, colour, x, y, width, height); if (vmsvga_fill_rect(s, colour, x, y, width, height) == 0) {
break; break;
#else }
#endif
args = 0; args = 0;
goto badcmd; goto badcmd;
#endif
case SVGA_CMD_RECT_COPY: case SVGA_CMD_RECT_COPY:
len -= 7; len -= 7;