ddraw: Filter invalid texture stage states passed by the application.

4194d804 · Henri Verbeet · Alexandre Julliard · 19067f12 · 4194d804
Commit 4194d804 authored Apr 01, 2009 by Henri Verbeet Committed by Alexandre Julliard Apr 01, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

device.c dlls/ddraw/device.c +13 -0

No files found.
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -4776,6 +4776,13 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface,
    if(!State)
        return DDERR_INVALIDPARAMS;

+    if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS)
+    {
+        WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType);
+        *State = 0;
+        return DD_OK;
+    }
+
    EnterCriticalSection(&ddraw_cs);

    if (l->sampler_state)
@@ -4896,6 +4903,12 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface,
    HRESULT hr;
    TRACE("(%p)->(%08x,%08x,%08x): Relay!\n", This, Stage, TexStageStateType, State);

+    if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS)
+    {
+        WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType);
+        return DD_OK;
+    }
+
    EnterCriticalSection(&ddraw_cs);

    if (l->sampler_state)