=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Forbid creating SRVs with level or layer count equal to 0.

Alexandre Julliard julliard at winehq.org
Thu Jun 16 10:20:56 CDT 2016


Module: wine
Branch: master
Commit: 5f4fc0a93722c8bee5b3dfeee2c598b63442ecc6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5f4fc0a93722c8bee5b3dfeee2c598b63442ecc6

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Thu Jun 16 11:59:32 2016 +0200

wined3d: Forbid creating SRVs with level or layer count equal to 0.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/view.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 68b134f..5973668 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -298,8 +298,10 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_
         struct wined3d_texture *texture = texture_from_resource(resource);
         unsigned int i;
 
-        if (desc->u.texture.level_idx >= texture->level_count
+        if (!desc->u.texture.level_count
+                || desc->u.texture.level_idx >= texture->level_count
                 || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx
+                || !desc->u.texture.layer_count
                 || desc->u.texture.layer_idx >= texture->layer_count
                 || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx)
             return E_INVALIDARG;




More information about the wine-cvs mailing list