wined3d: Validate vertex shader input signature register indices (AFL).

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Validate vertex shader input signature register indices (AFL).
cc16e0d2 · Henri Verbeet · Alexandre Julliard · a24b8267 · cc16e0d2
Commit cc16e0d2 authored Jul 25, 2017 by Henri Verbeet Committed by Alexandre Julliard Jul 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

shader.c dlls/wined3d/shader.c +10 -2

No files found.
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1684,14 +1684,22 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
    {
        for (i = 0; i < input_signature->element_count; ++i)
        {
-            reg_maps->input_registers |= 1u << input_signature->elements[i].register_idx;
+            if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX)
-            if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL)
+            {
+                if (input_signature->elements[i].register_idx >= ARRAY_SIZE(shader->u.vs.attributes))
+                {
+                    WARN("Invalid input signature register index %u.\n", input_signature->elements[i].register_idx);
+                    return WINED3DERR_INVALIDCALL;
+                }
+            }
+            else if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL)
            {
                if (input_signature->elements[i].sysval_semantic == WINED3D_SV_POSITION)
                    reg_maps->vpos = 1;
                else if (input_signature->elements[i].sysval_semantic == WINED3D_SV_IS_FRONT_FACE)
                    reg_maps->usesfacing = 1;
            }
+            reg_maps->input_registers |= 1u << input_signature->elements[i].register_idx;
        }
    }
    else if (!input_signature->elements && reg_maps->input_registers)