Changeset 82700 in vbox for trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c

Timestamp:

Jan 9, 2020 3:13:21 PM (5 years ago)

Author:

vboxsync

Message:

3D: Sampler index validation in ldl and ldd instructions, bugref:9613

File:

• trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c

@@ -3202 +3202 @@
     if (shader_version < WINED3D_SHADER_VERSION(2,0)) sampler_idx = ins->dst[0].reg.idx;
     else sampler_idx = ins->src[1].reg.idx;
+
+    AssertReturnVoid(sampler_idx < RT_ELEMENTS(ins->ctx->reg_maps->sampler_type));
     sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx];
 
@@ -3297 +3299 @@
 
     sampler_idx = ins->src[1].reg.idx;
+    AssertReturnVoid(sampler_idx < RT_ELEMENTS(ins->ctx->reg_maps->sampler_type));
+
     sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx];
     if(deviceImpl->stateBlock->textures[sampler_idx] &&
@@ -3325 +3329 @@
 
     sampler_idx = ins->src[1].reg.idx;
+    AssertReturnVoid(sampler_idx < RT_ELEMENTS(ins->ctx->reg_maps->sampler_type));
+
     sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx];
     if(deviceImpl->stateBlock->textures[sampler_idx] &&