cirrus_vga: fix division by 0 for color expansion rop
PATCH 1/1 cirrus_vga: fix division by 0 for color expansion rop
Commit d85d0d3883f5a567fa2969a0396e42e0a662b3fa introduces a regression with Windows ME that leads to a division by 0 and a crash.
It uses the color expansion rop with the source pitch set to 0. This is something allowed, as the manual explicitely says "When the source of color-expand data is display memory, the source pitch is ignored.".
This patch fixes this regression by computing sx, sy and others variables only if they are going to be used later, that is for a plain copy ROP. It basically consists in moving code.
--- hw/cirrus_vga.c | 65 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 32 deletions(-)
hw/cirrus_vga.c +33 -32
@@ -675,44 +675,45 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h) {int sx, sy;int dx, dy; -int width, height;int depth;int notify =0 ; - depth = s->vga.get_bpp (&s->vga) /8 ; - s->vga.get_resolution (&s->vga, &width, &height); - -/* extra x, y */ - sx = (src %ABS (s->cirrus_blt_srcpitch)) / depth; - sy = (src /ABS (s->cirrus_blt_srcpitch)); - dx = (dst %ABS (s->cirrus_blt_dstpitch)) / depth; - dy = (dst /ABS (s->cirrus_blt_dstpitch)); - -/* normalize width */ - w /= depth; - -/* if we're doing a backward copy, we have to adjust -our x/y to be the upper left corner (instead of the lower -right corner) */ -if (s->cirrus_blt_dstpitch <0 ) { - sx -= (s->cirrus_blt_width / depth) -1 ; - dx -= (s->cirrus_blt_width / depth) -1 ; - sy -= s->cirrus_blt_height -1 ; - dy -= s->cirrus_blt_height -1 ; - } +/* make to sure only copy if it's a plain copy ROP */ +if (*s->cirrus_rop == cirrus_bitblt_rop_fwd_src || + *s->cirrus_rop == cirrus_bitblt_rop_bkwd_src) { + +int width, height; + + depth = s->vga.get_bpp (&s->vga) /8 ; + s->vga.get_resolution (&s->vga, &width, &height); + +/* extra x, y */ + sx = (src %ABS (s->cirrus_blt_srcpitch)) / depth; + sy = (src /ABS (s->cirrus_blt_srcpitch)); + dx = (dst %ABS (s->cirrus_blt_dstpitch)) / depth; + dy = (dst /ABS (s->cirrus_blt_dstpitch)); + +/* normalize width */ + w /= depth; + +/* if we're doing a backward copy, we have to adjust +our x/y to be the upper left corner (instead of the lower +right corner) */ +if (s->cirrus_blt_dstpitch <0 ) { + sx -= (s->cirrus_blt_width / depth) -1 ; + dx -= (s->cirrus_blt_width / depth) -1 ; + sy -= s->cirrus_blt_height -1 ; + dy -= s->cirrus_blt_height -1 ; + } -/* are we in the visible portion of memory? */ -if (sx >=0 && sy >=0 && dx >=0 && dy >=0 && - (sx + w) <= width && (sy + h) <= height && - (dx + w) <= width && (dy + h) <= height) { - notify =1 ; +/* are we in the visible portion of memory? */ +if (sx >=0 && sy >=0 && dx >=0 && dy >=0 && + (sx + w) <= width && (sy + h) <= height && + (dx + w) <= width && (dy + h) <= height) { + notify =1 ; + } } -/* make to sure only copy if it's a plain copy ROP */ -if (*s->cirrus_rop != cirrus_bitblt_rop_fwd_src && - *s->cirrus_rop != cirrus_bitblt_rop_bkwd_src) - notify =0 ; -/* we have to flush all pending changes so that the copy is generated at the appropriate moment in time */ if (notify)
Signature · 1 line
1.7.2.3
Am 31.12.2010 um 20:11 schrieb Aurelien Jarno:
Quoted 42 lines
Commit
d85d0d3883f5a567fa2969a0396e42e0a662b3faintroduces a regression with Windows ME that leads to a division by 0 and a crash.It uses the color expansion rop with the source pitch set to 0. This is something allowed, as the manual explicitely says "When the source of color-expand data is display memory, the source pitch is ignored.".
This patch fixes this regression by computing sx, sy and others variables only if they are going to be used later, that is for a plain copy ROP. It basically consists in moving code.
Signed-off-by Aurelien Jarno <[email protected]>---
hw/cirrus_vga.c| 65 +++++++++++++++++++++++++++
+---------------------------1 files changed, 33 insertions(+), 32 deletions(-)hw/cirrus_vga.c +0
-13@@ -675,44 +675,45 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h) { int sx, sy;int dx, dy; -int width, height;int depth;int notify =0 ; - depth = s->vga.get_bpp (&s->vga) /8 ; - s->vga.get_resolution (&s->vga, &width, &height); - -/* extra x, y */ - sx = (src %ABS (s->cirrus_blt_srcpitch)) / depth; - sy = (src /ABS (s->cirrus_blt_srcpitch)); - dx = (dst %ABS (s->cirrus_blt_dstpitch)) / depth; - dy = (dst /ABS (s->cirrus_blt_dstpitch)); - -/* normalize width */ - w /= depth; -
hw/cirrus_vga.c static void cirrus_do_copy(CirrusVGAState *s, · line 682
Quoted 10 lines
hw/cirrus_vga.c +1
-9-/* if we're doing a backward copy, we have to adjust -our x/y to be the upper left corner (instead of the lower -right corner) */ -if (s->cirrus_blt_dstpitch <0 ) { - sx -= (s->cirrus_blt_width / depth) -1 ; - dx -= (s->cirrus_blt_width / depth) -1 ; - sy -= s->cirrus_blt_height -1 ; - dy -= s->cirrus_blt_height -1 ; - } +/* make to sure only copy if it's a plain copy ROP */
"make sure to ..." while you're at it.
Quoted 52 lines
hw/cirrus_vga.c +32
-10+if (*s->cirrus_rop == cirrus_bitblt_rop_fwd_src || + *s->cirrus_rop == cirrus_bitblt_rop_bkwd_src) { + +int width, height; + + depth = s->vga.get_bpp (&s->vga) /8 ; + s->vga.get_resolution (&s->vga, &width, &height); + +/* extra x, y */ + sx = (src %ABS (s->cirrus_blt_srcpitch)) / depth; + sy = (src /ABS (s->cirrus_blt_srcpitch)); + dx = (dst %ABS (s->cirrus_blt_dstpitch)) / depth; + dy = (dst /ABS (s->cirrus_blt_dstpitch)); + +/* normalize width */ + w /= depth; + +/* if we're doing a backward copy, we have to adjust +our x/y to be the upper left corner (instead of the lower +right corner) */ +if (s->cirrus_blt_dstpitch <0 ) { + sx -= (s->cirrus_blt_width / depth) -1 ; + dx -= (s->cirrus_blt_width / depth) -1 ; + sy -= s->cirrus_blt_height -1 ; + dy -= s->cirrus_blt_height -1 ; + } -/* are we in the visible portion of memory? */ -if (sx >=0 && sy >=0 && dx >=0 && dy >=0 && - (sx + w) <= width && (sy + h) <= height && - (dx + w) <= width && (dy + h) <= height) { - notify =1 ; +/* are we in the visible portion of memory? */ +if (sx >=0 && sy >=0 && dx >=0 && dy >=0 && + (sx + w) <= width && (sy + h) <= height && + (dx + w) <= width && (dy + h) <= height) { + notify =1 ; + } } -/* make to sure only copy if it's a plain copy ROP */ -if (*s->cirrus_rop != cirrus_bitblt_rop_fwd_src && - *s->cirrus_rop != cirrus_bitblt_rop_bkwd_src) - notify =0 ; -/* we have to flush all pending changes so that the copy is generated at the appropriate moment in time */ if (notify)
Signature · 1 line
1.7.2.3
Quoted 7 lines · Aurelien Jarno
Commit
d85d0d3883f5a567fa2969a0396e42e0a662b3faintroduces a regression with Windows ME that leads to a division by 0 and a crash.It uses the color expansion rop with the source pitch set to 0. This is something allowed, as the manual explicitely says "When the source of color-expand data is display memory, the source pitch is ignored.".
Quoted 8 lines
This patch fixes this regression by computing sx, sy and others variables only if they are going to be used later, that is for a plain copy ROP. It basically consists in moving code.
Signed-off-by Aurelien Jarno <[email protected]>--- hw/cirrus_vga.c | 65 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 32 deletions(-)
I have just discovered that this patch fixes bug #604166:
https://bugs.launchpad.net/qemu/+bug/604166
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net