d3dx9: Use an assert() to validate access to const_tbl[].

This check is essentially validating that the hardcoded state_table[] has reasonable values for the shader constant states. Use ARRAY_SIZE() to avoid warnings if the compiler chooses an unsigned integer to back enum SHADER_CONSTANT_TYPE. Based on an idea by Henri Verbeet. Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Use an assert() to validate access to const_tbl[].
cfc533b4 · Matteo Bruni · Alexandre Julliard · f8086a3e · cfc533b4
Commit cfc533b4 authored Mar 24, 2020 by Matteo Bruni Committed by Alexandre Julliard Mar 24, 2020
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

effect.c dlls/d3dx9_36/effect.c +1 -5

No files found.
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1469,11 +1469,7 @@ static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum SHAD
    D3DXVECTOR4 value;
    HRESULT ret;
-    if (op < 0 || op > SCT_PSINT)
+    assert(op < ARRAY_SIZE(const_tbl));
-    {
-        FIXME("Unknown op %u.\n", op);
-        return D3DERR_INVALIDCALL;
-    }
    element_count = param->bytes / const_tbl[op].elem_size;
    TRACE("%s, index %u, element_count %u.\n", const_tbl[op].name, index, element_count);
    if (param->type != const_tbl[op].type)