[PATCH 0/1] MR8407: wined3d: Fix missing data/resource type bounds check.

[PATCH 1/1] wined3d: Fix missing data/resource type bounds check.

[Yuxuan Shui]

From: Yuxuan Shui

---
 dlls/wined3d/shader_sm4.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 6027eb8dcdd..d61f73a9231 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -1680,7 +1680,10 @@ static void shader_sm4_read_instruction_modifier(uint32_t modifier, struct wined

if ((components & 0xfff0) != (components & 0xf) * 0x1110)
                 FIXME("Components (%#x) have different data types.\n", components);
-            ins->resource_data_type = data_type_table[data_type];
+            if (data_type >= ARRAY_SIZE(data_type_table))
+                FIXME("Unhandled data type %u\n", data_type);
+            else
+                ins->resource_data_type = data_type_table[data_type];
             break;
         }

@@ -1689,7 +1692,10 @@ static void shader_sm4_read_instruction_modifier(uint32_t modifier, struct wined
             enum wined3d_sm4_resource_type resource_type
                     = (modifier & WINED3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT;

-            ins->resource_type = resource_type_table[resource_type];
+            if (resource_type >= ARRAY_SIZE(resource_type_table))
+                FIXME("Unhandled resource type %u\n", resource_type);
+            else
+                ins->resource_type = resource_type_table[resource_type];
             break;
         }

[PATCH 0/1] MR8407: wined3d: Fix missing data/resource type bounds check. - approved

[Elizabeth Figura (＠zfigura)]

This merge request was approved by Elizabeth Figura.

[PATCH 0/1] MR8407: wined3d: Fix missing data/resource type bounds check. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.