Check for malformed source rect in DIB_DirectDrawSurfact_BltFast, and

return DDERR_INVALID_RECT.

Check for malformed source rect in DIB_DirectDrawSurfact_BltFast, and
f4205ad7 · Crestez Leonard · Alexandre Julliard · 2b98f325 · f4205ad7
Commit f4205ad7 authored Dec 21, 2004 by Crestez Leonard Committed by Alexandre Julliard Dec 21, 2004
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

dib.c dlls/ddraw/dsurface/dib.c +10 -0

No files found.
--- a/dlls/ddraw/dsurface/dib.c
+++ b/dlls/ddraw/dsurface/dib.c
@@ -999,6 +999,16 @@ DIB_DirectDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx,
 	rsrc->bottom = sdesc.dwHeight;
    }

+    /* Check source rect for validity. Copied from normal Blt. Fixes Baldur's Gate.*/
+    if ((rsrc->bottom > sdesc.dwHeight) || (rsrc->bottom < 0) ||
+	(rsrc->top > sdesc.dwHeight) || (rsrc->top < 0) ||
+	(rsrc->left > sdesc.dwWidth) || (rsrc->left < 0) ||
+	(rsrc->right > sdesc.dwWidth) || (rsrc->right < 0) ||
+	(rsrc->right < rsrc->left) || (rsrc->bottom < rsrc->top)) {
+        WARN("Application gave us bad source rectangle for BltFast.\n");
+	return DDERR_INVALIDRECT;
+    }
+ 
    h=rsrc->bottom-rsrc->top;
    if (h>ddesc.dwHeight-dsty) h=ddesc.dwHeight-dsty;
    if (h>sdesc.dwHeight-rsrc->top) h=sdesc.dwHeight-rsrc->top;